Changeset 930

Timestamp:

05/07/08 11:24:18 (2 months ago)

Author:

laurentj

Message:

fixed a warning generated during template compilation

Files:

• branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)

branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
-
+
+
+
+
+
+
+
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
-
+
+
+
+
+
+
+
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
-
+
+
+
+
+
+
+
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
-
+
+
+
+
+
+
+
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

trunk/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
+#if PHP50 || PHP51
+        // there is a @ because an exception in the callback function generates a warning in PHP 5.1.2
+        // (not in PHP 5.2)
+        $tplcontent = @preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#else
-        $tplcontent = preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#endif
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

trunk/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
+#if PHP50 || PHP51
+        // there is a @ because an exception in the callback function generates a warning in PHP 5.1.2
+        // (not in PHP 5.2)
+        $tplcontent = @preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#else
-        $tplcontent = preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#endif
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

trunk/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
+#if PHP50 || PHP51
+        // there is a @ because an exception in the callback function generates a warning in PHP 5.1.2
+        // (not in PHP 5.2)
+        $tplcontent = @preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#else
-        $tplcontent = preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#endif
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);

trunk/lib/jelix/tpl/jTplCompiler.class.php

@@ -190 +190 @@
-        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
-
+#if PHP50 || PHP51
+        // there is a @ because an exception in the callback function generates a warning in PHP 5.1.2
+        // (not in PHP 5.2)
+        $tplcontent = @preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#else
-        $tplcontent = preg_replace_callback("/{((.).*?)}/sm", array($this,'_callback'), $tplcontent);
+#endif
-
-        $tplcontent = preg_replace('/\?>\n?<\?php/', '', $tplcontent);