Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 0bb0e81fdc77c0eaf52da7ed06c31b70cf810ce3..4bb4c2c2192ef857b61da9e63608dce2b58b5020 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -34,25 +34,6 @@ sub import { #{{{
        hook(type => "preprocess", id => "calendar", call => \&preprocess);
 } #}}}
 
-sub needsbuild (@) { #{{{
-       my $needsbuild=shift;
-       foreach my $page (keys %pagestate) {
-               if (exists $pagestate{$page}{calendar}{nextchange}) {
-                       if ($pagestate{$page}{calendar}{nextchange} <= $time) {
-                               # force a rebuild so the calendar shows
-                               # the current day
-                               push @$needsbuild, $pagesources{$page};
-                       }
-                       if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
-                               # remove state, will be re-added if
-                               # the calendar is still there during the
-                               # rebuild
-                               delete $pagestate{$page}{calendar};
-                       }
-               }
-       }
-} # }}}
-
 sub is_leap_year (@) { #{{{
        my %params=@_;
        return ($params{year} % 4 == 0 && (($params{year} % 100 != 0) || $params{year} % 400 == 0));
@@ -400,4 +381,23 @@ sub preprocess (@) { #{{{
        return "\n<div><div class=\"calendar\">$calendar</div></div>\n";
 } #}}
 
+sub needsbuild (@) { #{{{
+       my $needsbuild=shift;
+       foreach my $page (keys %pagestate) {
+               if (exists $pagestate{$page}{calendar}{nextchange}) {
+                       if ($pagestate{$page}{calendar}{nextchange} <= $time) {
+                               # force a rebuild so the calendar shows
+                               # the current day
+                               push @$needsbuild, $pagesources{$page};
+                       }
+                       if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+                               # remove state, will be re-added if
+                               # the calendar is still there during the
+                               # rebuild
+                               delete $pagestate{$page}{calendar};
+                       }
+               }
+       }
+} # }}}
+
 1

diff --git a/doc/bugs/Problem_with_umlauts_and_friends.mdwn b/doc/bugs/Problem_with_umlauts_and_friends.mdwn
index ed37e49f41af189b3393db7e7296425cb18f925a..1223ef4b386574f898bde7aab0cfb85e62936ec8 100644 (file)
--- a/doc/bugs/Problem_with_umlauts_and_friends.mdwn
+++ b/doc/bugs/Problem_with_umlauts_and_friends.mdwn
@@ -12,3 +12,5 @@ sandbox page.
 
 > Yes, if you run a web browser in a non-utf8 locale, it can neither
 > display nor properly edit unicode. --[[Joey]]
+
+[[notabug|done]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index bd6afd4d462b203888d46da904f143ed9d8bcdf0..d18fb612a08406095accbad4549bf8896b7d2cc7 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-08 23:51-0500\n"
+"POT-Creation-Date: 2007-12-09 00:04-0500\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"