diff options
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 7 | ||||
| -rw-r--r-- | debian/NEWS | 10 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 18 |
4 files changed, 25 insertions, 15 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 9cf781a25..452fdd267 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -320,14 +320,13 @@ sub genfeed ($$$$@) { #{{{ my $page=shift; my @pages=@_; - my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page))); + my $url=URI->new(encode_utf8($config{url}."/".urlto($page,""))); my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1); my $content=""; my $lasttime = 0; foreach my $p (@pages) { - my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p))); - + my $u=URI->new(encode_utf8($config{url}."/".urlto($p, ""))); my $pcontent = absolute_urls(get_inline_content($p, $page), $url); $itemtemplate->param( @@ -415,7 +414,7 @@ sub pingurl (@) { #{{{ foreach my $page (keys %toping) { my $title=pagetitle(basename($page), 0); - my $url="$config{url}/".htmlpage($page); + my $url="$config{url}/".urlto($page, ""); foreach my $pingurl (@{$config{pingurl}}) { debug("Pinging $pingurl for $page"); eval { diff --git a/debian/NEWS b/debian/NEWS index 9e821668d..cadbdb997 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,7 +1,15 @@ +ikiwiki (1.50) unstable; urgency=low + + Permalinks and guids in rss and atom feeds for wikis using the usedirs + options will change in this release. If you have already enabled usedirs, + you may need to take steps to avoid flooding aggregators. + + -- Joey Hess <joeyh@debian.org> Sat, 14 Apr 2007 16:08:46 -0400 + ikiwiki (1.49) unstable; urgency=low Third-party plugins that use htmlpage() or abs2rel() to generate links - may need changes to support the new "userdir" option. + may need changes to support the new "usedirs" option. -- Joey Hess <joeyh@debian.org> Sun, 01 Apr 2007 16:20:09 -0400 diff --git a/debian/changelog b/debian/changelog index 5b03c7884..93f2de366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,11 @@ ikiwiki (1.50) UNRELEASED; urgency=low * Internal version number and installdir substitutions were lost, fix. * Apply patch from Ethan to improve an error message that should never happen. + * Patch from Tuomov to link to the directory in feeds when usedirs is in + effect. Note that this changes permalinks, so if you are already using + usedirs you'll have to deal with that on upgrade to this version. - -- Joey Hess <joeyh@debian.org> Sat, 14 Apr 2007 16:06:01 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 14 Apr 2007 16:11:30 -0400 ikiwiki (1.49) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 1c5c04a79..cd5e2ac19 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: 2007-04-12 00:10-0400\n" +"POT-Creation-Date: 2007-04-14 16:40-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" @@ -30,7 +30,7 @@ msgid "%s is not an editable page" msgstr "" #: ../IkiWiki/CGI.pm:418 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:186 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:183 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 #: ../IkiWiki/Render.pm:166 msgid "discussion" @@ -160,20 +160,20 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:149 +#: ../IkiWiki/Plugin/inline.pm:146 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:163 +#: ../IkiWiki/Plugin/inline.pm:160 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:194 ../IkiWiki/Render.pm:99 +#: ../IkiWiki/Plugin/inline.pm:191 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:403 +#: ../IkiWiki/Plugin/inline.pm:399 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -545,11 +545,11 @@ msgstr "" msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../IkiWiki.pm:104 +#: ../IkiWiki.pm:106 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:151 ../IkiWiki.pm:152 +#: ../IkiWiki.pm:153 ../IkiWiki.pm:154 msgid "Error" msgstr "" @@ -557,7 +557,7 @@ msgstr "" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:622 +#: ../IkiWiki.pm:624 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" |