urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
master
joey 2007-04-14 20:46:41 +00:00
parent 250bd850e2
commit 9b145798c7
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki/Plugin/inline.pm
View File

@ -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 {

10
debian/NEWS vendored
View File

@ -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

5
debian/changelog vendored
View File

@ -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

18
po/ikiwiki.pot
View File

@ -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 ""