aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/NEWS13
-rw-r--r--templates/page.tmpl8
2 files changed, 15 insertions, 6 deletions
diff --git a/debian/NEWS b/debian/NEWS
index c9b8f3d09..6074d6260 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,16 @@
+ikiwiki (3.20100505) UNRELEASED; urgency=low
+
+ There is a significant change to the page.tmpl template in this version.
+ 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 FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+ <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
+ </TMPL_IF>
+
+ -- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 21:47:08 -0400
+
ikiwiki (3.20100427) unstable; urgency=low
This version of ikiwiki has a lot of changes that you need to know about.
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 9242ddfe3..4920d3cc8 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,12 +6,8 @@
</TMPL_IF>
<head>
<TMPL_UNLESS ISPAGE>
-<TMPL_IF FORCEBASEURL>
-<base href="<TMPL_VAR FORCEBASEURL>" />
-<TMPL_ELSE>
-<TMPL_IF BASEURL>
-<base href="<TMPL_VAR BASEURL>" />
-</TMPL_IF>
+<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
</TMPL_IF>
</TMPL_UNLESS>
<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>