diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 21:16:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 21:16:16 -0400 |
| commit | 3d82d47e1896b8e64c1e22b09a05968fc481aebf (patch) | |
| tree | c3a3b75a833ea059c2eac189d616a43d86297549 | |
| parent | 82f0facb620e59594aaf318c2eaf676c7788f1e6 (diff) | |
| parent | dd40fbdf0394fa2ea7f588a64faad6cd05208fff (diff) | |
Merge branch 'master' into autoconfig
| -rw-r--r-- | IkiWiki.pm | 11 | ||||
| -rw-r--r-- | doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn | 2 |
2 files changed, 6 insertions, 7 deletions
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]] |