[phpwiki-checkins] SF.net SVN: phpwiki:[8856] trunk/lib

[<var...@us...>]

Revision: 8856
          http://sourceforge.net/p/phpwiki/code/8856
Author:   vargenau
Date:     2014-05-26 14:34:55 +0000 (Mon, 26 May 2014)
Log Message:
-----------
Prepare for PHP 5.5: use preg_replace_callback instead of preg_replace/e

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php
    trunk/lib/stdlib.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014-05-06 14:21:05 UTC (rev 8855)
+++ trunk/lib/WikiPlugin.php	2014-05-26 14:34:55 UTC (rev 8856)
@@ -153,10 +153,12 @@
     // Expand [arg] to $request->getArg("arg") unless preceded by ~
     function expandArg($argval, &$request)
     {
-        // return preg_replace('/\[(\w[\w\d]*)\]/e', '$request->getArg("$1")',
         // Replace the arg unless it is preceded by a ~
-        $ret = preg_replace('/([^~]|^)\[(\w[\w\d]*)\]/e',
-            '"$1" . $request->getArg("$2")',
+        $ret = preg_replace_callback('/([^~]|^)\[(\w[\w\d]*)\]/',
+            function ($m) {
+                global $request;
+                return "$m[1]" . $request->getArg("$m[2]");
+            },
             $argval);
         // Ditch the ~ so later versions can be expanded if desired
         return preg_replace('/~(\[\w[\w\d]*\])/', '$1', $ret);

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-05-06 14:21:05 UTC (rev 8855)
+++ trunk/lib/stdlib.php	2014-05-26 14:34:55 UTC (rev 8856)
@@ -138,9 +138,11 @@
     if (!$str) {
         return 'empty.';
     }
-
-    return preg_replace('/[^-_:A-Za-z0-9]|(?<=^)[^A-Za-z]/e',
-        "'.' . sprintf('%02x', ord('\\0'))",
+    return preg_replace_callback(
+        '/[^-_:A-Za-z0-9]|(?<=^)[^A-Za-z]/',
+        function ($m) {
+            return '.' . sprintf('%02x', ord('$m'));
+        },
         $str);
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.