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

* Patch fixing various additional problems with test suite. Closes: #425891 

once more.
master
joey 2007-06-26 22:11:59 +00:00
parent bde5f35b7b
commit afcf0dc79e
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -842,7 +842,6 @@ sub template_params (@) { #{{{
return "";
}
require HTML::Template;
my @ret=(
filter => sub {
my $text_ref = shift;
@ -857,6 +856,7 @@ sub template_params (@) { #{{{
} #}}}
sub template ($;@) { #{{{
require HTML::Template;
HTML::Template->new(template_params(@_));
} #}}}

1
IkiWiki/Plugin/inline.pm
View File

@ -155,6 +155,7 @@ sub preprocess_inline (@) { #{{{
$ret.=$linktemplate->output;
}
require HTML::Template;
my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
if (! @params) {
return sprintf(gettext("nonexistant template %s"), $params{template});

4
debian/changelog vendored
View File

@ -5,8 +5,10 @@ ikiwiki (2.3) UNRELEASED; urgency=low
w/o confusing ikiwiki.
* Rcs modules are now imported, so other modules that need similar
normalisation of configs etc can do so.
* Patch fixing various additional problems with test suite. Closes: #425891
once more.
-- Joey Hess <joeyh@debian.org> Sat, 23 Jun 2007 13:10:06 +0100
-- Joey Hess <joeyh@debian.org> Tue, 26 Jun 2007 18:08:24 -0400
ikiwiki (2.2) unstable; urgency=low

4
doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
View File

@ -55,4 +55,6 @@ Other than ikiwiki.in, am I missing something here?
>> I think this is [debbug 425891]. I have sent there a patch that incorporates the original
>> author's two diffs but has a more correct solution to the first problem described
>> above. -- Thomas, 2007-06-26
>> above. -- Thomas, 2007-06-26
[[done]]

10
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-06-23 13:12+0100\n"
"POT-Creation-Date: 2007-06-26 18:10-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"
@ -42,7 +42,7 @@ msgid "%s is not an editable page"
msgstr ""
#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
#: ../IkiWiki/Plugin/inline.pm:183 ../IkiWiki/Plugin/opendiscussion.pm:17
#: ../IkiWiki/Plugin/inline.pm:184 ../IkiWiki/Plugin/opendiscussion.pm:17
#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:91
#: ../IkiWiki/Render.pm:171
msgid "discussion"
@ -186,16 +186,16 @@ msgstr ""
msgid "Add a new post titled:"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:160
#: ../IkiWiki/Plugin/inline.pm:161
#, perl-format
msgid "nonexistant template %s"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:191 ../IkiWiki/Render.pm:95
#: ../IkiWiki/Plugin/inline.pm:192 ../IkiWiki/Render.pm:95
msgid "Discussion"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:402
#: ../IkiWiki/Plugin/inline.pm:403
msgid "RPC::XML::Client not found, not pinging"
msgstr ""

2
t/basewiki_brokenlinks.t
View File

@ -4,6 +4,6 @@ use strict;
use Test::More tests => 3;
ok(! system("make ikiwiki.out"));
ok(! system("PERL5LIB=. ./ikiwiki.out -plugin brokenlinks -rebuild -underlaydir=basewiki t/basewiki_brokenlinks t/basewiki_brokenlinks/out"));
ok(! system("perl -T -I. ./ikiwiki.out -plugin brokenlinks -rebuild -underlaydir=basewiki -templatedir=templates t/basewiki_brokenlinks t/basewiki_brokenlinks/out"));
ok(`grep 'no broken links' t/basewiki_brokenlinks/out/index.html`);
system("rm -rf t/basewiki_brokenlinks/out t/basewiki_brokenlinks/.ikiwiki");