Merge pull request #7351 from thierrymarianne/remove-deprecated-modifer

Replace PCRE e modifier with callback
PrestaShop · Jan 18, 2017 · ea59592 · ea59592
2 parents f215ee5 + e605cc9
commit ea59592
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/classes/webservice/WebserviceOutputJSON.php b/classes/webservice/WebserviceOutputJSON.php
@@ -160,7 +160,13 @@ public function overrideContent($content)
     {
         $content = '';
         $content .= json_encode($this->content);
-        $content = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", $content);
+        $content = preg_replace_callback(
+            "/\\\\u([a-f0-9]{4})/",
+            function ($matches) {
+                return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec('U' . $matches[1])));
+            },
+            $content
+        );
         return $content;
     }