MDL-76362 core: plugin names must be strings to be valid

2023-01-23 09:15:55 +08:00
parent e068f2284f
commit 93ab932211
2 changed files with 8 additions and 3 deletions
@@ -1001,10 +1001,9 @@ $cache = '.var_export($cache, true).';
            }
            // Modules MUST NOT have any underscores,
            // component normalisation would break very badly otherwise!
-            return (bool)preg_match('/^[a-z][a-z0-9]*$/', $pluginname);
-
+            return !is_null($pluginname) && (bool) preg_match('/^[a-z][a-z0-9]*$/', $pluginname);
        } else {
-            return (bool)preg_match('/^[a-z](?:[a-z0-9_](?!__))*[a-z0-9]+$/', $pluginname ?? '');
+            return !is_null($pluginname) && (bool) preg_match('/^[a-z](?:[a-z0-9_](?!__))*[a-z0-9]+$/', $pluginname);
        }
    }