dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f0610d0)
* Hacky fix for PHPTAL 0.7 bug to be consistent with PHPTAL 1.0 (${foo} interpolation...
authorBrion Vibber <brion@users.mediawiki.org>
Mon, 27 Sep 2004 03:05:20 +0000 (03:05 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Mon, 27 Sep 2004 03:05:20 +0000 (03:05 +0000)
* Switch usercss & userjs bits due to above; SkinPHPTal now sets them _with_ the CDATA markers, as PHPTAL seems unwilling to recognize XML tags with tal: bits on them inside a CDATA section in the template (though oddly enough it interpreted the ${bits} just fine!)

PHPTAL-NP-0.7.0/libs/PHPTAL/ExpressionFunctions.php patch | blob | history
includes/SkinPHPTal.php patch | blob | history
skins/MonoBook.pt patch | blob | history

diff --git a/PHPTAL-NP-0.7.0/libs/PHPTAL/ExpressionFunctions.php b/PHPTAL-NP-0.7.0/libs/PHPTAL/ExpressionFunctions.php
index c13a71c..a81897f 100644 (file)
--- a/PHPTAL-NP-0.7.0/libs/PHPTAL/ExpressionFunctions.php
+++ b/PHPTAL-NP-0.7.0/libs/PHPTAL/ExpressionFunctions.php
@@ -103,7 +103,11 @@ function PHPTAL_ES_path_toString(&$exp, $value)
     if ($value == "nothing") { return 'null'; }
     if ($value == "default") { return '$__default__'; }
     if (preg_match('/^@[_a-z][0-9a-z_]*$/i', $value)) { return substr($value, 1); }
-    return '$__ctx__->getToString("'. $value .'")';
+# HACKHACKHACKHACKHACK! <- for fixing ${foo} not being escaped.
+# In PHPTAL 1.0.0 it _is_ escaped, and apparently it's supposed to be.
+# We need to be consistent to work on both.
+#    return '$__ctx__->getToString("'. $value .'")';
+    return 'htmlspecialchars($__ctx__->get("'. $value .'"))';
 }
 
 
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index a836f29..15d65a9 100644 (file)
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -707,6 +707,10 @@ class SkinPHPTal extends Skin {
                                $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript&dontcountme=s');
                        }
                }
+               $this->usercss = '/*<![CDATA[*/ ' . $this->usercss . ' /*]]>*/';
+               if( $this->userjsprev ) {
+                       $this->userjsprev = '/*<![CDATA[*/ ' . $this->userjsprev . ' /*]]>*/';
+               }
        }
        
        /**
diff --git a/skins/MonoBook.pt b/skins/MonoBook.pt
index 1477424..d863e20 100644 (file)
--- a/skins/MonoBook.pt
+++ b/skins/MonoBook.pt
@@ -11,9 +11,9 @@
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
     <script type="text/javascript" tal:attributes="src jsvarurl"></script>
     <script type="text/javascript" src="${stylepath}/common/wikibits.js"></script>
-    <style tal:condition="usercss" type="text/css">/*<![CDATA[*/ ${usercss} /*]]>*/</style>
+    <style tal:condition="usercss" tal:content="structure usercss" type="text/css"></style>
     <script tal:condition="userjs" type="text/javascript" tal:attributes="src userjs"></script><script 
-      tal:condition="userjsprev" type="text/javascript">/*<![CDATA[*/${userjsprev}/*]]>*/</script>
+      tal:condition="userjsprev" tal:content="structure userjsprev" type="text/javascript"></script>
   </head>
   <body tal:attributes="ondblclick body_ondblclick|default; class nsclass|default">
     <div id="globalWrapper">
Wiklou, le Wiki du Wiklou