From 4f5cda954a6b64677f9b48223a91e0ec8785e055 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@matomo.org>
Date: Tue, 7 Dec 2021 20:44:01 +0100
Subject: Fix 'Call to undefined function Piwik\piwik_fix_lbrace()' (#18461)

---
 core/Common.php | 32 ++++++++++++++++++++++++++++++++
 core/Twig.php   | 21 +--------------------
 2 files changed, 33 insertions(+), 20 deletions(-)

(limited to 'core')

diff --git a/core/Common.php b/core/Common.php
index 90ceda1d4f..08751d5cbe 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -577,6 +577,38 @@ class Common
         return $value;
     }
 
+    /**
+     * Replaces lbrace with an encoded entity to prevent angular from parsing the content
+     *
+     * @deprecated Will be removed, once the vue js migration is done
+     *
+     * @param $string
+     * @return array|string|string[]|null
+     */
+    public static function fixLbrace($string)
+    {
+        $chars = array('{', '&#x7B;', '&#123;', '&lcub;', '&lbrace;', '&#x0007B;');
+
+        static $search;
+        static $replace;
+
+        if (!isset($search)) {
+            $search = array_map(function ($val) { return $val . $val; }, $chars);
+        }
+        if (!isset($replace)) {
+            $replace = array_map(function ($val) { return $val . '&#8291;' . $val; }, $chars);
+        }
+
+        $replacedString = is_null($string) ? $string : str_replace($search, $replace, $string);
+
+        // try to replace characters until there are no changes
+        if ($string !== $replacedString) {
+            return self::fixLbrace($replacedString);
+        }
+
+        return $string;
+    }
+
     /*
      * Generating unique strings
      */
diff --git a/core/Twig.php b/core/Twig.php
index e5b5e24958..abf3549af2 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -42,26 +42,7 @@ function piwik_format_number($string, $minFractionDigits, $maxFractionDigits)
 
 function piwik_fix_lbrace($string)
 {
-    $chars = array('{', '&#x7B;', '&#123;', '&lcub;', '&lbrace;', '&#x0007B;');
-
-    static $search;
-    static $replace;
-
-    if (!isset($search)) {
-        $search = array_map(function ($val) { return $val . $val; }, $chars);
-    }
-    if (!isset($replace)) {
-        $replace = array_map(function ($val) { return $val . '&#8291;' . $val; }, $chars);
-    }
-
-    $replacedString = is_null($string) ? $string : str_replace($search, $replace, $string);
-
-    // try to replace characters until there are no changes
-    if ($string !== $replacedString) {
-        return piwik_fix_lbrace($replacedString);
-    }
-
-    return $string;
+    return Common::fixLbrace($string);
 }
 
 function piwik_escape_filter(Environment $env, $string, $strategy = 'html', $charset = null, $autoescape = false) {
-- 
cgit v1.2.3