aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-26 21:16:16 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-26 21:16:16 -0400
commit3d82d47e1896b8e64c1e22b09a05968fc481aebf (patch)
treec3a3b75a833ea059c2eac189d616a43d86297549 /IkiWiki.pm
parent82f0facb620e59594aaf318c2eaf676c7788f1e6 (diff)
parentdd40fbdf0394fa2ea7f588a64faad6cd05208fff (diff)
downloadikiwiki-3d82d47e1896b8e64c1e22b09a05968fc481aebf.tar
ikiwiki-3d82d47e1896b8e64c1e22b09a05968fc481aebf.tar.gz
Merge branch 'master' into autoconfig
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm11
1 files changed, 4 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) {