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

Move yesno function out of inline and into IkiWiki core, not exported.

master
Joey Hess 2008-07-12 12:01:08 -04:00
parent d36361b010
commit d101269bde
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki.pm
View File

@ -337,7 +337,7 @@ sub readfile ($;$$) { #{{{
return $ret; return $ret;
} #}}} } #}}}
sub prep_writefile ($$) { sub prep_writefile ($$) { #{{{
my $file=shift; my $file=shift;
my $destdir=shift; my $destdir=shift;
@ -361,7 +361,7 @@ sub prep_writefile ($$) {
} }
return 1; return 1;
} } #}}}
sub writefile ($$$;$$) { #{{{ sub writefile ($$$;$$) { #{{{
my $file=shift; # can include subdirs my $file=shift; # can include subdirs
@ -1202,6 +1202,12 @@ sub gettext { #{{{
} }
} #}}} } #}}}
sub yesno ($) { #{{{
my $val=shift;
return (defined $val && lc($val) eq gettext("yes"));
} #}}}
sub pagespec_merge ($$) { #{{{ sub pagespec_merge ($$) { #{{{
my $a=shift; my $a=shift;
my $b=shift; my $b=shift;

5
IkiWiki/Plugin/inline.pm
View File

@ -94,11 +94,6 @@ package IkiWiki;
my %toping; my %toping;
my %feedlinks; my %feedlinks;
sub yesno ($) { #{{{
my $val=shift;
return (defined $val && lc($val) eq "yes");
} #}}}
sub preprocess_inline (@) { #{{{ sub preprocess_inline (@) { #{{{
my %params=@_; my %params=@_;

11
IkiWiki/Plugin/poll.pm
View File

@ -11,18 +11,13 @@ sub import { #{{{
hook(type => "sessioncgi", id => "poll", call => \&sessioncgi); hook(type => "sessioncgi", id => "poll", call => \&sessioncgi);
} # }}} } # }}}
sub yesno ($) { #{{{
my $val=shift;
return (defined $val && lc($val) eq "yes");
} #}}}
my %pagenum; my %pagenum;
sub preprocess (@) { #{{{ sub preprocess (@) { #{{{
my %params=(open => "yes", total => "yes", percent => "yes", @_); my %params=(open => "yes", total => "yes", percent => "yes", @_);
my $open=yesno($params{open}); my $open=IkiWIki::yesno($params{open});
my $showtotal=yesno($params{total}); my $showtotal=IkiWiki::yesno($params{total});
my $showpercent=yesno($params{percent}); my $showpercent=IkiWiki::yesno($params{percent});
$pagenum{$params{page}}++; $pagenum{$params{page}}++;
my %choices; my %choices;

1
debian/changelog vendored
View File

@ -17,6 +17,7 @@ ikiwiki (2.54) UNRELEASED; urgency=low
numerous bugs. numerous bugs.
* meta: Support a guid option, to allow forcing a particular url or * meta: Support a guid option, to allow forcing a particular url or
uuid in feeds. (smcv) uuid in feeds. (smcv)
* Move yesno function out of inline and into IkiWiki core, not exported.
-- Josh Triplett <josh@freedesktop.org> Wed, 09 Jul 2008 21:30:33 -0700 -- Josh Triplett <josh@freedesktop.org> Wed, 09 Jul 2008 21:30:33 -0700