Your message dated Sat, 25 Jan 2014 21:50:15 +0000
with message-id <[email protected]>
and subject line Bug#735123: fixed in ikiwiki 3.20140125
has caused the Debian Bug report #735123,
regarding ikiwiki: inline plugin: allow feed title distinct from page title
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
735123: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735123
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: ikiwiki
Version: 3.20120629
Severity: wishlist
Dear Joey,
A reader of my blog asked me to alter the <title> element of the feeds
to something more descriptive than just 'blog' -- but I didn't want to
alter the page title within the overall ikiwiki instance. (Nor did I
particularly feel like I should be maintaining my own feed templates
just for this).
So, please consider adding a title parameter to the inline directive,
which would override the current default title (the including page title,
or the wikiname if it's the index page). If reportbug will let me,
I'll attach a patch to this report to that effect (against 3.20120629,
sorry; I looked at HEAD and didn't see anything that would be problematic
at a glance).
-- System Information:
Debian Release: jessie/sid
APT prefers stable
APT policy: (900, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.10-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- ikiwiki-3.20120629/doc/ikiwiki/directive/inline.mdwn 2012-05-27 22:56:03.000000000 +0200
+++ ikiwiki-3.20120629~csr1/doc/ikiwiki/directive/inline.mdwn 2014-01-12 21:35:02.000000000 +0100
@@ -49,6 +49,8 @@
Set to 0 to show all matching pages.
* `archive` - If set to "yes", only list page titles and some metadata, not
full contents.
+* `title` - Sets the title of the rss feed if one is generated.
+ Defaults to the name of the page.
* `description` - Sets the description of the rss feed if one is generated.
Defaults to the name of the wiki.
* `skip` - Specify a number of pages to skip displaying. Can be useful
--- ikiwiki-3.20120629/IkiWiki/Plugin/inline.pm 2012-05-17 06:31:15.000000000 +0200
+++ ikiwiki-3.20120629~csr1/IkiWiki/Plugin/inline.pm 2014-01-12 21:41:55.000000000 +0100
@@ -186,6 +186,13 @@
if (! exists $params{feedshow} && exists $params{show}) {
$params{feedshow}=$params{show};
}
+ my $title;
+ if (exists $params{title}) {
+ $title = $params{title};
+ }
+ else {
+ $title = $params{page} ne "index" ? pagetitle($params{page}) : $config{wikiname};
+ }
my $desc;
if (exists $params{description}) {
$desc = $params{description}
@@ -465,7 +472,7 @@
if (! $params{preview}) {
writefile($rssp, $config{destdir},
genfeed("rss",
- $config{url}."/".$rssp, $desc, $params{guid}, $params{page}, @feedlist));
+ $config{url}."/".$rssp, $title, $desc, $params{guid}, $params{page}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$rssdesc" href="$rssurl" />};
}
@@ -475,7 +482,7 @@
will_render($params{destpage}, $atomp);
if (! $params{preview}) {
writefile($atomp, $config{destdir},
- genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{page}, @feedlist));
+ genfeed("atom", $config{url}."/".$atomp, $title, $desc, $params{guid}, $params{page}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$atomdesc" href="$atomurl" />};
}
@@ -614,6 +621,7 @@
sub genfeed ($$$$$@) {
my $feedtype=shift;
my $feedurl=shift;
+ my $feedtitle=shift;
my $feeddesc=shift;
my $guid=shift;
my $page=shift;
@@ -687,7 +695,7 @@
my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1);
$template->param(
- title => $page ne "index" ? pagetitle($page) : $config{wikiname},
+ title => $feedtitle,
wikiname => $config{wikiname},
pageurl => $url,
content => $content,
--- End Message ---
--- Begin Message ---
Source: ikiwiki
Source-Version: 3.20140125
We believe that the bug you reported is fixed in the latest version of
ikiwiki, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joey Hess <[email protected]> (supplier of updated ikiwiki package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 25 Jan 2014 16:40:32 -0400
Source: ikiwiki
Binary: ikiwiki
Architecture: source all
Version: 3.20140125
Distribution: unstable
Urgency: medium
Maintainer: Joey Hess <[email protected]>
Changed-By: Joey Hess <[email protected]>
Description:
ikiwiki - a wiki compiler
Closes: 731797 735123
Changes:
ikiwiki (3.20140125) unstable; urgency=medium
.
* inline: Allow overriding the title of the feed. Closes: #735123
Thanks, Christophe Rhodes
* osm: Escape name parameter. Closes: #731797
Checksums-Sha1:
b68a1b1e727cd240f12e7163ef459748e7fc3900 1842 ikiwiki_3.20140125.dsc
215f52dc53def45cc2a4d1781d64d3d08ff545a9 3170332 ikiwiki_3.20140125.tar.gz
9d418c5d6d8309a4ba1aa5023903526b9d0f864f 1507968 ikiwiki_3.20140125_all.deb
Checksums-Sha256:
4efed115246ca78060490f96e1bc11a7aec36f84c6706a734778f32f978b8836 1842
ikiwiki_3.20140125.dsc
0d822a02eca7b749d7b7d57eb0c1ac362c63093c72b8591fd7db5e54612f291b 3170332
ikiwiki_3.20140125.tar.gz
bee3eca48fef51caa0ececf62380f5bdc97053753e521f2f7baead61058835a5 1507968
ikiwiki_3.20140125_all.deb
Files:
4acce3ca08d406615057c13c66eae83f 1842 web optional ikiwiki_3.20140125.dsc
dffb835165464354d12e30f18360f81e 3170332 web optional ikiwiki_3.20140125.tar.gz
fbf63f4c7d3d486a2b31458e499756d6 1507968 web optional
ikiwiki_3.20140125_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIVAwUBUuQu/8kQ2SIlEuPHAQhC7A/9HIt05AypUe/0/gjKoErNny1XRg9WozNn
CSyxZcewxiSPhZuO2PsYH9280iv6VeXDG1SI82D1S2k9ksc6K+oeW+J6Xgqx52Ku
s7A6eucNjaVt7bY5LGeSNgs/vgZsIljUVfvFjoQ8gyt3xn4WUy27y9lQg9QEaDFw
4fzJ1dRTTvFxTjv5BcGLF0ysdAENrkrqV5v7QxuPY8R5Ovn20t1FqViX/MJW1WQV
XPQtktP+JkiCntl3TLAKIg4p8ID4w7u5opAXpzu5Ax40+FrA87v9kHdxCJo3+Rn6
yjmBySvFiIxtY97U+wK0osHmeh2DL51VqVpfiHTDCc0DWh+37ZiapMfpQpK9zumC
seURUFA77vmIEQ+k0wwm1rLlYvidIK3uAf8ix50U/rYTSfcHvH9eSdjuYper/JlG
t/uIbkA/QD1IGRtkoWZWB+3E4r465wdGw9HnSTBe1kNxfDyAcD7CXl0lysYnDS3Q
NTq3Ye3+O8LjUic2JNa6bXHK5TbwVkcGZyIjMP/K97oGZ2kbVUZrPOL/P4eTR4ny
awxY66zi7ShjeGJlG46J0Wm219EjuKaOqh/DpDPJwKcTPkGBpOwWuJR1KIb2NE83
byvJfuNzEGpUUVio5Yk7DsVmVYFAxt8ScZrv8I9ruqaylO0toHEsSYfBwN24LSV9
2mVntk6Cs+0=
=QXQU
-----END PGP SIGNATURE-----
--- End Message ---
