diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | templates/inlinepage.tmpl | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 0440f4020..8af0d7889 100644 --- 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 a9c7447fa..e44c26f74 100644 --- 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 4207b7cc6..1d9f18320 100644 --- 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 a736dacb5..71d57b008 100644 --- 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 249ee2efb..b903adb19 100644 --- 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> |