projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f52f395)
add NEWS about template change
authorJoey Hess <joey@kitenet.net>
Thu, 6 May 2010 01:51:03 +0000 (21:51 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 6 May 2010 01:51:03 +0000 (21:51 -0400)
debian/NEWS patch | blob | history
templates/page.tmpl patch | blob | history

diff --git a/debian/NEWS b/debian/NEWS
index c9b8f3d0942df436ceca1c0164dce0266550c42e..6074d6260ec2d46d45e7933e986535d2de640934 100644 (file)
--- 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.
 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 9242ddfe3c0d626068dfc3f50cc5caabd17a62d7..4920d3cc8e52779e7ac0080713c7bd8024390135 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,12 +6,8 @@
 </TMPL_IF>
 <head>
 <TMPL_UNLESS ISPAGE>
 </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>
 </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>
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.