]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e73e88 58a07f9)
Merge commit '58a07f9e5436ec815c0cb5736a9680096c977eed' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:34:45 +0000 (00:34 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:34:45 +0000 (00:34 -0500)
Conflicts:
templates/page.tmpl

1  2 
IkiWiki/Wrapper.pm patch | diff1 | diff2 | blob | history
templates/page.tmpl patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Wrapper.pm
Simple merge
diff --cc templates/page.tmpl
index f018711371fb97d5eea4e2615b3f543994b125af,f5257058c04cd8733947c809d6882f6ec4ae3d74..68dc886ec84d3355039f5ee7ec3257c659efff06
--- 1/templates/page.tmpl
--- 2/templates/page.tmpl
+++ b/templates/page.tmpl
@@@ -1,10 -1,19 +1,19 @@@
  <TMPL_IF HTML5><!DOCTYPE html>
 -<html>
 +<html lang="en">
  <TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 -<html xmlns="http://www.w3.org/1999/xhtml">
 +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  </TMPL_IF>
  <head>
+ <TMPL_UNLESS ISPAGE>
+ <TMPL_IF NAME="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>
  <meta http-equiv="Cache-Control" content="must-revalidate" />
  <title><TMPL_VAR TITLE></title>
wiki compiler