summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm1
-rw-r--r--IkiWiki/Render.pm1
-rw-r--r--debian/NEWS2
-rw-r--r--templates/page.tmpl6
4 files changed, 5 insertions, 5 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0da2c93c8..a79b66039 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1747,6 +1747,7 @@ sub misctemplate ($$;@) {
});
$template->param(
+ dynamic => 1,
title => $title,
wikiname => $config{wikiname},
content => $content,
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7d66bf5ec..e5ba0079b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -138,7 +138,6 @@ sub genpage ($$) {
title => $page eq 'index'
? $config{wikiname}
: pagetitle(basename($page)),
- ispage => 1,
wikiname => $config{wikiname},
content => $content,
backlinks => $backlinks,
diff --git a/debian/NEWS b/debian/NEWS
index 6074d6260..0f2c1f562 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,7 +4,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
If you have locally modified versions of that template, you will need
to update it to contain the following in the HTML <head>:
- <TMPL_UNLESS ISPAGE>
+ <TMPL_IF DYNAMIC>
<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
</TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 4920d3cc8..41fffa263 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
</TMPL_IF>
<head>
-<TMPL_UNLESS ISPAGE>
+<TMPL_IF DYNAMIC>
<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
</TMPL_IF>
@@ -48,7 +48,7 @@
</TMPL_IF>
</span>
</span>
-<TMPL_IF ISPAGE>
+<TMPL_UNLESS DYNAMIC>
<TMPL_IF SEARCHFORM>
<TMPL_VAR SEARCHFORM>
</TMPL_IF>
@@ -132,7 +132,7 @@
</TMPL_IF>
<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
-<TMPL_IF ISPAGE>
+<TMPL_UNLESS DYNAMIC>
<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
<TMPL_IF TAGS>