From: Joey Hess <joey@kodama.kitenet.net> Date: Sun, 27 Jul 2008 01:16:16 +0000 (-0400) Subject: Merge branch 'master' into autoconfig X-Git-Tag: 2.60~176 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d82d47e1896b8e64c1e22b09a05968fc481aebf?hp=82f0facb620e59594aaf318c2eaf676c7788f1e6 Merge branch 'master' into autoconfig --- diff --git a/IkiWiki.pm b/IkiWiki.pm index a138ac8bf..4ad19a499 100644 --- 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 0ab9f0bd6..fed6cd026 100644 --- 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]]