Merge branch 'release/1.7.42.1'

getgrav · Jun 15, 2023 · 4cd1378 · 4cd1378
2 parents dc20945 + cf6bf7d
commit 4cd1378
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.7.42.1
+## 06/15/2023
+
+2. [](#improved)
+   * Quick fix for `isDangerousFunction` when `$name` was a closure [#3727](https://github.com/getgrav/grav/issues/3727)
+
 # v1.7.42
 ## 06/14/2023
 

diff --git a/system/defines.php b/system/defines.php
@@ -9,7 +9,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.7.42');
+define('GRAV_VERSION', '1.7.42.1');
 define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
 define('GRAV_TESTING', false);
 

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
@@ -2056,17 +2056,19 @@ public static function isDangerousFunction($name): bool
             'forward_static_call_array',
         ];
 
-        $name = strtolower($name);
+        if (is_string($name)) {
+            $name = strtolower($name);
+        }
 
         if ($name instanceof \Closure) {
             return false;
         }
 
-        if (strpos($name, "\\") !== false) {
+        if (is_array($name) || strpos($name, ":") !== false) {
             return false;
         }
 
-        if (is_array($name) || strpos($name, ":") !== false) {
+        if (strpos($name, "\\") !== false) {
             return false;
         }