Merge branch 'master' into autoconfig

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a138ac8bf487f5fda1eb421a30c4dbcea2e104f6..4ad19a49931bc9ea0a9018c82c1a3aad792377f3 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1068,13 +1068,10 @@ sub preprocess ($$$;$$) { #{{{
                        if ($preprocessing{$page}++ > 3) {
                                # Avoid loops of preprocessed pages preprocessing
                                # other pages that preprocess them, etc.
-                               #translators: The first parameter is a
-                               #translators: preprocessor directive name,
-                               #translators: the second a page name, the
-                               #translators: third a number.
-                               return "[[".sprintf(gettext("%s preprocessing loop detected on %s at depth %i"),
-                                       $command, $page, $preprocessing{$page}).
-                               "]]";
+                               return "[[!$command <span class=\"error\">".
+                                       sprintf(gettext("preprocessing loop detected on %s at depth %i"),
+                                               $page, $preprocessing{$page}).
+                                       "</span>]]";
                        }
                        my $ret;
                        if (! $scan) {

diff --git a/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn b/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn
index 0ab9f0bd60009a4ce42b103acf6511ca15b279d4..fed6cd0268f71f74e80993efefc105ab83b12509 100644 (file)
--- a/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn
+++ b/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn
@@ -15,3 +15,5 @@ see the following error message. --[[Paweł|ptecza]]
 >> when I sent my report. It seems that <http://git.ikiwiki.info/?p=ikiwiki>
 >> URL works now. So, we should be happy that it was self-fixed bug ;)
 >> --[[Paweł|ptecza]]
+
+>>> If it happens again, maybe take a full dump of the page? [[done]]