From ee166d1b6d59e30729f1ab18e96eddd4d5bc0b6e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Mon, 20 Oct 2008 08:53:36 -0400
Subject: fixes confirmed

---
 doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn b/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn
index 5d5e90f7a..472597c46 100644
--- a/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn
+++ b/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn
@@ -11,6 +11,10 @@ Replacing "·" with "-" in `wikiname` fixed this login issue.
 > issues too.) Seems like I will have to possibly break some sessions and
 > entity-encode the wikiname in the cookie.. [[done]]. --[[Joey]]
 
+>> I confirm it fixes the bug for me. --[[intrigeri]]
+
 (BTW, such a char was replaced by -I don't remember what encoding thingie- in my setup file, when running `ikiwiki-transition setupformat`.)
 
 > Thanks for the heads up, fixed that too. --[[Joey]]
+
+>> I confirm it fixes the bug for me. --[[intrigeri]]
-- 
cgit v1.2.3


From cc311beef30bb73a460ce3c573401d6db2d85a80 Mon Sep 17 00:00:00 2001
From: AndrewGreenberg <AndrewGreenberg@web>
Date: Mon, 20 Oct 2008 21:34:02 -0400
Subject: Added "SVG aren't images" bug.

---
 doc/bugs/SVG_files_not_recognized_as_images.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/SVG_files_not_recognized_as_images.mdwn

(limited to 'doc/bugs')

diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
new file mode 100644
index 000000000..2339b075a
--- /dev/null
+++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
@@ -0,0 +1,5 @@
+In ikiwiki 2.66, SVG images are not recognized as images. In ikiwiki.pm, the hardcoded list of image file extensions does not include ".svg", which it probably should unless there's some other issue about rendering SVGs?
+
+The 'img' plugin also seems to not support SVGs.
+
+
-- 
cgit v1.2.3


From 59ef1ebe5dbe10b48024f48f665dceef8d735a88 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 21:51:33 -0400
Subject: response

---
 doc/bugs/SVG_files_not_recognized_as_images.mdwn | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
index 2339b075a..41452e7c1 100644
--- a/doc/bugs/SVG_files_not_recognized_as_images.mdwn
+++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
@@ -1,5 +1,15 @@
-In ikiwiki 2.66, SVG images are not recognized as images. In ikiwiki.pm, the hardcoded list of image file extensions does not include ".svg", which it probably should unless there's some other issue about rendering SVGs?
+In ikiwiki 2.66, SVG images are not recognized as images. In ikiwiki.pm,
+the hardcoded list of image file extensions does not include ".svg", which
+it probably should unless there's some other issue about rendering SVGs?
 
 The 'img' plugin also seems to not support SVGs.
 
-
+> SVG images can only be included via an `<object>`, `<embed>`, or
+> `<iframe>` tag. Or, perhaps as [inline SVG](http://wiki.svg.org/Inline_SVG). 
+> The [[plugins/htmlscrubber]] strips all three tags since they can easily
+> be used maliciously. If doing inline SVG, I'd worry that the svg file
+> could be malformed and mess up the html, or even inject javascript. So,
+> the only options seem to be only supporting svgs on wikis that do not
+> sanitize their html, or assuming that svgs are trusted content and
+> embedding them inline. None of which seem particularly palatable.
+> --[[Joey]]
-- 
cgit v1.2.3


From dc9cb095d13fa75e20604fdb79b4276ac45f64a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 21:54:24 -0400
Subject: response2

---
 doc/bugs/SVG_files_not_recognized_as_images.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
index 41452e7c1..f178a4b1a 100644
--- a/doc/bugs/SVG_files_not_recognized_as_images.mdwn
+++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
@@ -12,4 +12,7 @@ The 'img' plugin also seems to not support SVGs.
 > the only options seem to be only supporting svgs on wikis that do not
 > sanitize their html, or assuming that svgs are trusted content and
 > embedding them inline. None of which seem particularly palatable.
+> 
+> I suppose the other option would be converting the svg file to a static
+> image (png). The img plugin could probably do that fairly simply.
 > --[[Joey]]
-- 
cgit v1.2.3


From f635ff0d2904c54ea021500907cb5c61bca0ce5b Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Tue, 21 Oct 2008 11:12:12 -0400
Subject: htmlscrubber patch for sanitizing SVG and MathML

---
 doc/bugs/SVG_files_not_recognized_as_images.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
index f178a4b1a..207edd426 100644
--- a/doc/bugs/SVG_files_not_recognized_as_images.mdwn
+++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
@@ -16,3 +16,14 @@ The 'img' plugin also seems to not support SVGs.
 > I suppose the other option would be converting the svg file to a static
 > image (png). The img plugin could probably do that fairly simply.
 > --[[Joey]]
+
+>> I'm working on inline SVG and MathML support in ikiwiki and I've
+>> modified my htmlscrubber to sanitize SVG and MathML using the
+>> whitelists from html5lib.  Here's a [patch][].  I've also made some
+>> notes about this here: [[todo/svg]].
+>> 
+>> I suspect that this bug may have caught the eye of anyone interested
+>> in this sort of thing.  I'll elaborate a bit on my user page to avoid
+>> getting off-topic here. --[[JasonBlevins]], October 21, 2008
+
+ [patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hp=3bdaccea119ec0e1b289a0da2f6d90e2219b8d66;hb=fe333c8e5b4a5f374a059596ee698dacd755182d;hpb=be0b4f603f918444b906e42825908ddac78b7073
-- 
cgit v1.2.3


From 04a9bda1e6aa6edabc4511a8fe357be7f790deb7 Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 21:48:36 -0400
Subject: attach patch for http/https proxy support

---
 doc/bugs/http_proxy_for_openid.mdwn | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index e8f87f9c4..a8611da6c 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -6,10 +6,42 @@ I have found if I add:
 
     newenviron[i++]="HTTPS_PROXY=http://host.domain.com:3128";
 
-to IkiWiki/Wrapper.pm it solves the problem for https requests, however it obviously would be preferred if the proxy name is not configured.
+to IkiWiki/Wrapper.pm it solves the problem for https requests, however it obviously would be preferred if the proxy name is not hard coded.
 
 Also, the ability to set HTTPS\_CA\_FILE and HTTPS\_CA\_DIR might benefit some people. Then again, it I can't see any evidence that the SSL certificate of the server is being checked. See the [[bug_report|ssl_certificates_not_checked_with_openid]] I filed on this separate issue.
 
 Unfortunately, HTTP\_PROXY doesn't work for http requests, it looks like that library is different.
 
+---
+
+Update 2008-10-26:
+
+Better solution, one that works for both http and https, and uses config options. It appears to work...
+
+Note that using $ua->proxy(['https'], ...); won't work, you get a "Not Implemented" error, see <http://community.activestate.com/forum-topic/lwp-https-requests-proxy>.
+
+Also note that the proxy won't work with liblwpx-paranoidagent-perl, I had to remove liblwpx-paranoidagent-perl first.
+
+Please get the patch from the *.mdwn source.
+
+louie:/usr/share/perl5/IkiWiki/Plugin# diff -u openid.pm.old openid.pm
+--- openid.pm.old	2008-10-26 12:18:58.094489360 +1100
++++ openid.pm	2008-10-26 12:40:05.763429880 +1100
+@@ -165,6 +165,14 @@
+ 	        $ua=LWP::UserAgent->new;
+ 	}
+ 
++	if (defined($config{"http_proxy"})) {
++		$ua->proxy(['http'], $config{"http_proxy"});
++	}
++
++	if (defined($config{"https_proxy"})) {
++		$ENV{HTTPS_PROXY} = $config{"https_proxy"};
++	}
++
+ 	# Store the secret in the session.
+ 	my $secret=$session->param("openid_secret");
+ 	if (! defined $secret) {
+
+
 Brian May
-- 
cgit v1.2.3


From 697c54acc5e5fe1b31b3a1ee43f7de656127d4ed Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:08:29 -0400
Subject: solution?

---
 .../ssl_certificates_not_checked_with_openid.mdwn  | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 2dc74a984..75cfe05e0 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -66,3 +66,47 @@ significantly harder than the network based attacks."
 With regards to implementation, I am surprised that the libraries don't seem to
 do this checking, already, and by default. Unfortunately, I am not sure how to test
 this adequately, see <http://bugs.debian.org/466055>. -- Brian May
+
+--- 
+
+I think [[!cpan Crypt::SSLeay]] already supports checking the certificate. The trick
+is to get [[!cpan LWP::UserAgent]], which is used by [[!cpan LWPx::ParanoidAgent]] to
+enable this checking.
+
+I think the trick is to set on of the the following environment variables before retrieving
+the data:
+
+$ENV{HTTPS_CA_DIR} = "/etc/ssl/certs/";
+$ENV{HTTPS_CA_FILE} = "/etc/ssl/certs/file.pem";
+
+Unfortunately I get weird results if the certificate verification fails, tshark shows the following communications with my proxy server:
+
+HTTP CONNECT db.debian.org:443 HTTP/1.0
+<tls stuff>
+HTTP CONNECT proxy.pri:3128 HTTP/1.0
+HTTP HTTP/1.0 403 Forbidden (text/html)
+
+Why it is trying to connect to the proxy server via the proxy server is beyond me. This only happens if the certificate verification fails (I think). I will continue investigating. My test code is:
+
+
+#!/usr/bin/perl -w
+use strict;
+#require LWPx::ParanoidAgent;
+#my $ua = LWPx::ParanoidAgent->new;
+
+require LWP::UserAgent;
+my $ua = LWP::UserAgent->new;
+
+$ua->proxy(['http'], 'http://proxy.pri:3128');
+$ENV{HTTPS_PROXY} = "http://proxy.pri:3128";
+$ENV{HTTPS_CA_DIR} = "/etc/ssl/certs/";
+
+
+my $response = $ua->get("https://db.debian.org/");
+
+if ($response->is_success) {
+    print $response->content;  # or whatever
+} else {
+    die $response->status_line;
+}
+
-- 
cgit v1.2.3


From 2e85da8e11265ab90692c58716d66d28703a8cbb Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:27:04 -0400
Subject: improve formatting

---
 doc/bugs/ssl_certificates_not_checked_with_openid.mdwn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 75cfe05e0..28ac3d7d6 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -76,15 +76,15 @@ enable this checking.
 I think the trick is to set on of the the following environment variables before retrieving
 the data:
 
-$ENV{HTTPS_CA_DIR} = "/etc/ssl/certs/";
-$ENV{HTTPS_CA_FILE} = "/etc/ssl/certs/file.pem";
+$ENV{HTTPS\_CA\_DIR} = "/etc/ssl/certs/";  
+$ENV{HTTPS\_CA\_FILE} = "/etc/ssl/certs/file.pem";  
 
 Unfortunately I get weird results if the certificate verification fails, tshark shows the following communications with my proxy server:
 
-HTTP CONNECT db.debian.org:443 HTTP/1.0
-<tls stuff>
-HTTP CONNECT proxy.pri:3128 HTTP/1.0
-HTTP HTTP/1.0 403 Forbidden (text/html)
+HTTP CONNECT db.debian.org:443 HTTP/1.0  
+[tls stuff]  
+HTTP CONNECT proxy.pri:3128 HTTP/1.0  
+HTTP HTTP/1.0 403 Forbidden (text/html)  
 
 Why it is trying to connect to the proxy server via the proxy server is beyond me. This only happens if the certificate verification fails (I think). I will continue investigating. My test code is:
 
-- 
cgit v1.2.3


From 450045d7031b4843bf2219fda69b480a302296a3 Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:32:27 -0400
Subject: add link to Debian bug report.

---
 doc/bugs/http_proxy_for_openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index a8611da6c..3d0c99b83 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -18,7 +18,7 @@ Update 2008-10-26:
 
 Better solution, one that works for both http and https, and uses config options. It appears to work...
 
-Note that using $ua->proxy(['https'], ...); won't work, you get a "Not Implemented" error, see <http://community.activestate.com/forum-topic/lwp-https-requests-proxy>.
+Note that using $ua->proxy(['https'], ...); won't work, you get a "Not Implemented" error, see <http://community.activestate.com/forum-topic/lwp-https-requests-proxy>. Also see [[!debbug 129528]].
 
 Also note that the proxy won't work with liblwpx-paranoidagent-perl, I had to remove liblwpx-paranoidagent-perl first.
 
-- 
cgit v1.2.3


From c231adc7386d1eac0fcdf75bd54d32bbbf4ad48b Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:33:31 -0400
Subject: minor change

---
 doc/bugs/ssl_certificates_not_checked_with_openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 28ac3d7d6..2e71ab031 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -65,7 +65,7 @@ significantly harder than the network based attacks."
 
 With regards to implementation, I am surprised that the libraries don't seem to
 do this checking, already, and by default. Unfortunately, I am not sure how to test
-this adequately, see <http://bugs.debian.org/466055>. -- Brian May
+this adequately, see [[!debbug 466055]]. -- Brian May
 
 --- 
 
-- 
cgit v1.2.3


From b522c708f0cf87b282e4d5ff0f2425040a3b7bcf Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:51:05 -0400
Subject: Replace weirdness section with link to Debian bug report.

---
 .../ssl_certificates_not_checked_with_openid.mdwn  | 33 ++--------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 2e71ab031..80390622a 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -79,34 +79,5 @@ the data:
 $ENV{HTTPS\_CA\_DIR} = "/etc/ssl/certs/";  
 $ENV{HTTPS\_CA\_FILE} = "/etc/ssl/certs/file.pem";  
 
-Unfortunately I get weird results if the certificate verification fails, tshark shows the following communications with my proxy server:
-
-HTTP CONNECT db.debian.org:443 HTTP/1.0  
-[tls stuff]  
-HTTP CONNECT proxy.pri:3128 HTTP/1.0  
-HTTP HTTP/1.0 403 Forbidden (text/html)  
-
-Why it is trying to connect to the proxy server via the proxy server is beyond me. This only happens if the certificate verification fails (I think). I will continue investigating. My test code is:
-
-
-#!/usr/bin/perl -w
-use strict;
-#require LWPx::ParanoidAgent;
-#my $ua = LWPx::ParanoidAgent->new;
-
-require LWP::UserAgent;
-my $ua = LWP::UserAgent->new;
-
-$ua->proxy(['http'], 'http://proxy.pri:3128');
-$ENV{HTTPS_PROXY} = "http://proxy.pri:3128";
-$ENV{HTTPS_CA_DIR} = "/etc/ssl/certs/";
-
-
-my $response = $ua->get("https://db.debian.org/");
-
-if ($response->is_success) {
-    print $response->content;  # or whatever
-} else {
-    die $response->status_line;
-}
-
+Unfortunately I get weird results if the certificate verification fails [[!debbug 503440]].
+It still seems to work though, regardless.
-- 
cgit v1.2.3


From ecd60221ff2f880bb6c022de5357102e173773c3 Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:52:09 -0400
Subject: add my name

---
 doc/bugs/ssl_certificates_not_checked_with_openid.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 80390622a..71a8d70fb 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -79,5 +79,7 @@ the data:
 $ENV{HTTPS\_CA\_DIR} = "/etc/ssl/certs/";  
 $ENV{HTTPS\_CA\_FILE} = "/etc/ssl/certs/file.pem";  
 
-Unfortunately I get weird results if the certificate verification fails [[!debbug 503440]].
+Unfortunately I get weird results if the certificate verification fails, see [[!debbug 503440]].
 It still seems to work though, regardless.
+
+-- Brian May
-- 
cgit v1.2.3


From b7c9682b32b0b7e52f9df1f8b32713de8e702e1f Mon Sep 17 00:00:00 2001
From: "https://brian.may.myopenid.com//"
 <https://brian.may.myopenid.com//@web>
Date: Sat, 25 Oct 2008 22:53:55 -0400
Subject: fix typo.

---
 doc/bugs/ssl_certificates_not_checked_with_openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 71a8d70fb..04ece0ae8 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -73,7 +73,7 @@ I think [[!cpan Crypt::SSLeay]] already supports checking the certificate. The t
 is to get [[!cpan LWP::UserAgent]], which is used by [[!cpan LWPx::ParanoidAgent]] to
 enable this checking.
 
-I think the trick is to set on of the the following environment variables before retrieving
+I think the trick is to set one of the the following environment variables before retrieving
 the data:
 
 $ENV{HTTPS\_CA\_DIR} = "/etc/ssl/certs/";  
-- 
cgit v1.2.3


From f4f099e88e287e12f99c92950af5f8143dc4a8b8 Mon Sep 17 00:00:00 2001
From: Jason Blevins <jrblevin@sdf.lonestar.org>
Date: Tue, 28 Oct 2008 21:43:44 -0400
Subject: Bug report re shortcuts during preview

---
 doc/bugs/cannot_preview_shortcuts.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/bugs/cannot_preview_shortcuts.mdwn

(limited to 'doc/bugs')

diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
new file mode 100644
index 000000000..a2fd3533a
--- /dev/null
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -0,0 +1,2 @@
+Shortcuts such as \[[!google foo]] do not work when previewing pages.
+--[[JasonBlevins]]
-- 
cgit v1.2.3


From 33a0e84ddbb9fe9c068cb40641ccec8554514151 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 29 Oct 2008 14:20:31 -0400
Subject: fix preview of shortcuts

Move shortcut processing back to checkconfig, and avoid it failing if the
srcdir is not defined.
---
 IkiWiki/Plugin/shortcut.pm             | 18 ++++++++++--------
 debian/changelog                       |  1 +
 doc/bugs/cannot_preview_shortcuts.mdwn |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'doc/bugs')

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 7bfce586f..77131edb0 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -7,7 +7,7 @@ use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "shortcut", call => \&getsetup);
-	hook(type => "refresh", id => "shortcut", call => \&refresh);
+	hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
 	hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
 } #}}}
 
@@ -19,14 +19,16 @@ sub getsetup () { #{{{
 		},
 } #}}}
 
-sub refresh () { #{{{
-	# Preprocess the shortcuts page to get all the available shortcuts
-	# defined before other pages are rendered.
-	my $srcfile=srcfile("shortcuts.mdwn", 1);
-	if (! defined $srcfile) {
-		error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+sub checkconfig () { #{{{
+	if (defined $config{srcdir}) {
+		# Preprocess the shortcuts page to get all the available shortcuts
+		# defined before other pages are rendered.
+		my $srcfile=srcfile("shortcuts.mdwn", 1);
+		if (! defined $srcfile) {
+			error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+		}
+		IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 	}
-	IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 } # }}}
 
 sub preprocess_shortcut (@) { #{{{
diff --git a/debian/changelog b/debian/changelog
index 299cf1af2..4547cda3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
   * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
+  * shortcut: Fix display of shortcuts while previewing.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index a2fd3533a..2e7ef13b7 100644
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -1,2 +1,4 @@
 Shortcuts such as \[[!google foo]] do not work when previewing pages.
 --[[JasonBlevins]]
+
+> Broken during the setup dumping changes, now fixed. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 06e57cd569797bd60b6bb50010d6fe5f02fafb48 Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Wed, 29 Oct 2008 15:18:19 -0400
Subject: I'm not sure whether I understand this "raw_enabled" setting in the
 context of rst.

---
 doc/bugs/rst_tweak.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/rst_tweak.mdwn b/doc/bugs/rst_tweak.mdwn
index 8c7d8134d..a506d4344 100644
--- a/doc/bugs/rst_tweak.mdwn
+++ b/doc/bugs/rst_tweak.mdwn
@@ -27,3 +27,5 @@ Does the Perl version of this plugin still exist?  There appears to be no "rst.p
 
 > No, only the python version exists. It does have `raw_enabled` set.
 > --[[Joey]]
+
+I am sorry, but I am confused. Does this mean that I can use Ikiwiki features that translate to HTML in rst files? For example, when I use a \[[pagename]]-style link in a rst file, the page generated by Ikiwiki's rst plugin says &lt;a href="./../pagename/">pagename&lt;/a> as text. The link is expanded correctly, but the result isn't interpreted as HTML. Is that what is supposed to happen? --Peter
-- 
cgit v1.2.3


From 95a1d0f436d65091c7dd521efe335e703b4026c6 Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Wed, 29 Oct 2008 15:30:53 -0400
Subject: Clarified my question about selectively disabling backlinks.

---
 doc/bugs/disabling_backlinks.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/disabling_backlinks.mdwn b/doc/bugs/disabling_backlinks.mdwn
index ba96a4e2b..415708a50 100644
--- a/doc/bugs/disabling_backlinks.mdwn
+++ b/doc/bugs/disabling_backlinks.mdwn
@@ -28,3 +28,5 @@ auto-generated index is insufficient.
 > tagged, I think you have larger problems than tags and backlinks being
 > the same. Like keeping that list of links up to date as tags are added
 > and changed. --[[Joey]]
+
+I see your point, Joey. I need to maintain that list manually, though, because the automatically generated list is too brief. \[[!map ...]] generates just a list of titles or descriptions. I need a list that contains both. See [[this_posting|ikiwiki/directive/map/discussion]] for more details. Until \[[!map]] can do that, I'm stuck with a manually maintained list. Which means that every link shows up in the backlinks.
-- 
cgit v1.2.3


From 3b8740ebee010eee61d24faee6f0f5a4b74495ee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 29 Oct 2008 18:06:00 -0400
Subject: response

---
 doc/bugs/rst_tweak.mdwn | 14 +++++++++++++-
 docwiki.setup           |  2 +-
 po/ikiwiki.pot          | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/rst_tweak.mdwn b/doc/bugs/rst_tweak.mdwn
index a506d4344..9d433e24e 100644
--- a/doc/bugs/rst_tweak.mdwn
+++ b/doc/bugs/rst_tweak.mdwn
@@ -28,4 +28,16 @@ Does the Perl version of this plugin still exist?  There appears to be no "rst.p
 > No, only the python version exists. It does have `raw_enabled` set.
 > --[[Joey]]
 
-I am sorry, but I am confused. Does this mean that I can use Ikiwiki features that translate to HTML in rst files? For example, when I use a \[[pagename]]-style link in a rst file, the page generated by Ikiwiki's rst plugin says &lt;a href="./../pagename/">pagename&lt;/a> as text. The link is expanded correctly, but the result isn't interpreted as HTML. Is that what is supposed to happen? --Peter
+I am sorry, but I am confused. Does this mean that I can use Ikiwiki
+features that translate to HTML in rst files? For example, when I use a
+\[[pagename]]-style link in a rst file, the page generated by Ikiwiki's rst
+plugin says &lt;a href="./../pagename/">pagename&lt;/a> as text. The link
+is expanded correctly, but the result isn't interpreted as HTML. Is that
+what is supposed to happen? --Peter
+
+> `raw_enabled` allows you to use the
+> [raw directive](http://docutils.sourceforge.net/docs/ref/rst/directives.html),
+> but this is not used by ikiwiki for wikilinks or anything else. 
+> That's why the [[plugin_page|plugins/rst]] has its note about 
+> issues with wikilinks and directives. You'd have to put those inside
+> raw directives yourself to avoid rst escaping their result. --[[Joey]]
diff --git a/docwiki.setup b/docwiki.setup
index 6d732fd6b..276955e8d 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -15,5 +15,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{goodstuff version haiku polygen fortune rst}],
 }
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 7a2891ea5..ab28f956c 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 20:44-0400\n"
+"POT-Creation-Date: 2008-10-29 17:42-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -129,7 +129,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr ""
 
@@ -250,18 +250,18 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -660,18 +660,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr ""
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:47
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
@@ -934,11 +934,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr ""
 
-- 
cgit v1.2.3


From 1be6b0a6275917d12fd2a10da7f0d6dceab6f5fb Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Wed, 29 Oct 2008 20:02:02 -0400
Subject: Note on fix

---
 doc/bugs/cannot_preview_shortcuts.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index 2e7ef13b7..7c830898d 100644
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -2,3 +2,9 @@ Shortcuts such as \[[!google foo]] do not work when previewing pages.
 --[[JasonBlevins]]
 
 > Broken during the setup dumping changes, now fixed. --[[Joey]] [[done]]
+
+>> Just a quick note that this fix interacts with the way the `listdirectives`
+>> directive gets its list of non-shortcut directives.  At the moment it
+>> still works, but it relies on the fact that the `listdirectives` `checkconfig`
+>> hook is called before the `shortcut` `checkconfig` hook.
+>> -- [[Will]]
-- 
cgit v1.2.3


From 354d22e27b4d9cb8207e038de4f342545435d2c6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 30 Oct 2008 13:41:19 -0400
Subject: don't rely on plugin load order when determining generated directives

Instead, shortcuts will explicitly be marked as such when registered, and
listdirectives can filter them out.
---
 IkiWiki/Plugin/listdirectives.pm       | 9 ++++-----
 IkiWiki/Plugin/shortcut.pm             | 1 +
 doc/bugs/cannot_preview_shortcuts.mdwn | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'doc/bugs')

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index fc8927ccb..2ab3e4665 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -30,7 +30,7 @@ sub getsetup () { #{{{
 } #}}}
 
 my @fulllist;
-my @earlylist;
+my @shortlist;
 my $pluginstring;
 
 sub checkconfig () { #{{{
@@ -40,15 +40,14 @@ sub checkconfig () { #{{{
 	else {
 		$config{directive_description_dir} =~ s/\/+$//;
 	}
-
-	@earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
 } #}}}
 
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 
 	@fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
-	$pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
+	@shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
+	$pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{listdirectives}{shown}) {
@@ -77,7 +76,7 @@ sub preprocess (@) { #{{{
 		@pluginlist = @fulllist;
 	}
 	else {
-		@pluginlist = @earlylist;
+		@pluginlist = @shortlist;
 	}
 	
 	my $result = '<ul class="listdirectives">';
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 77131edb0..dec8afdb5 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -39,6 +39,7 @@ sub preprocess_shortcut (@) { #{{{
 	}
 
 	hook(type => "preprocess", no_override => 1, id => $params{name},
+		shortcut => 1,
 		call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
 	#translators: This is used to display what shortcuts are defined.
diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index 7c830898d..d7045b2dc 100644
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -8,3 +8,10 @@ Shortcuts such as \[[!google foo]] do not work when previewing pages.
 >> still works, but it relies on the fact that the `listdirectives` `checkconfig`
 >> hook is called before the `shortcut` `checkconfig` hook.
 >> -- [[Will]]
+
+>> The order plugins are loaded is effectively random. (`keys %hooks`).
+>> So I've made shortcuts pass a 'shortcut' parameter when registering
+>> them, which listdirectives can grep out of the full list of directives.
+>> That may not be the best name to give it, especially if other plugins
+>> generate directives too. Seemed better than forcing shortcut's
+>> checkconfig hook to run last tho. --[[Joey]]
-- 
cgit v1.2.3