Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0440f4020ffb24dbea30be7745bc85d49aac7841..8af0d7889ae6daa457e16e8d819160aaf1d776b8 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -598,7 +598,7 @@ sub htmllink ($$$;@) { #{{{
                                        page => pagetitle(lc($link), 1),
                                        from => $lpage
                                ).
-                               "\">?</a>$linktext</span>"
+                               "\" rel=\"nofollow\">?</a>$linktext</span>"
                }
        }
        

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index a9c7447fa8faf6a082e714b84cd203f2c4e3355d..e44c26f747b66397fd52838be45ad1853641ab46 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -407,14 +407,14 @@ sub aggregate (@) { #{{{
                        # that contains invalid UTF-8 sequences. Convert
                        # feed to ascii to try to work around.
                        $feed->{message}.=" ".sprintf(gettext("(invalid UTF-8 stripped from feed)"));
-                       $content=Encode::decode_utf8($content);
+                       $content=Encode::decode_utf8($content, 0);
                        $f=eval{XML::Feed->parse(\$content)};
                }
                if ($@) {
                        # Another possibility is badly escaped entities.
                        $feed->{message}.=" ".sprintf(gettext("(feed entities escaped)"));
                        $content=~s/\&(?!amp)(\w+);/&$1;/g;
-                       $content=Encode::decode_utf8($content);
+                       $content=Encode::decode_utf8($content, 0);
                        $f=eval{XML::Feed->parse(\$content)};
                }
                if ($@) {

diff --git a/debian/changelog b/debian/changelog
index 4207b7cc6492651bc530022b641dfd9f11a8e428..1d9f18320fe52e520070bcd9028e84ea214cd4e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ikiwiki (2.48) UNRELEASED; urgency=low
+
+  * Add rel=nofollow to edit links. This may prevent some spiders from
+    pounding on the cgi following edit links.
+  * When calling decode_utf8 on known-problimatic content in aggregate,
+    explicitly pass 0 (FB_DEFAULT) as the second parameter. Apparently perl
+    5.8 needs this to avoid crashing on malformed utf-8, despite its docs
+    saying it is the default.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 28 May 2008 03:07:37 -0400
+
 ikiwiki (2.47) unstable; urgency=low
 
   * mdwn: Add a multimarkdown setup file option.

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index a736dacb541b0a152aa46933081865b135e398f8..71d57b00830fcdf821d87535f195e8add7d4e173 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -46,7 +46,7 @@ License: <TMPL_VAR LICENSE>
 <div class="actions">
 <ul>
 <TMPL_IF NAME="EDITURL">
-<li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK></li>

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 249ee2efbd2d7f16da4b3140ce685c879bfc8730..b903adb19a4744021907ac47e4cc280129209e57 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -30,7 +30,7 @@
 <div class="actions">
 <ul>
 <TMPL_IF NAME="EDITURL">
-<li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="RECENTCHANGESURL">
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>