From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 12 Jul 2008 16:01:08 +0000 (-0400)
Subject: Move yesno function out of inline and into IkiWiki core, not exported.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/d101269bde7eb2d3497b8fe9e6cc6e78aec4663c?ds=sidebyside

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c1d9119e8..f1a5f8058 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -337,7 +337,7 @@ sub readfile ($;$$) { #{{{
 	return $ret;
 } #}}}
 
-sub prep_writefile ($$) {
+sub prep_writefile ($$) { #{{{
 	my $file=shift;
 	my $destdir=shift;
 	
@@ -361,7 +361,7 @@ sub prep_writefile ($$) {
 	}
 
 	return 1;
-}
+} #}}}
 
 sub writefile ($$$;$$) { #{{{
 	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 ($$) { #{{{
 	my $a=shift;
 	my $b=shift;
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2dcd1a90a..02c04cc00 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -94,11 +94,6 @@ package IkiWiki;
 my %toping;
 my %feedlinks;
 
-sub yesno ($) { #{{{
-	my $val=shift;
-	return (defined $val && lc($val) eq "yes");
-} #}}}
-
 sub preprocess_inline (@) { #{{{
 	my %params=@_;
 	
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 6edf233b4..32cb5c48f 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -11,18 +11,13 @@ sub import { #{{{
 	hook(type => "sessioncgi", id => "poll", call => \&sessioncgi);
 } # }}}
 
-sub yesno ($) { #{{{
-	my $val=shift;
-	return (defined $val && lc($val) eq "yes");
-} #}}}
-
 my %pagenum;
 sub preprocess (@) { #{{{
 	my %params=(open => "yes", total => "yes", percent => "yes", @_);
 
-	my $open=yesno($params{open});
-	my $showtotal=yesno($params{total});
-	my $showpercent=yesno($params{percent});
+	my $open=IkiWIki::yesno($params{open});
+	my $showtotal=IkiWiki::yesno($params{total});
+	my $showpercent=IkiWiki::yesno($params{percent});
 	$pagenum{$params{page}}++;
 
 	my %choices;
diff --git a/debian/changelog b/debian/changelog
index ea3ba077b..0694b8190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ ikiwiki (2.54) UNRELEASED; urgency=low
     numerous bugs.
   * meta: Support a guid option, to allow forcing a particular url or
     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