Fix deprecated functionality: trim(): passing null to parameter #1 ($…

…string) of type string is deprecated
OpenMage · Oct 14, 2021 · f25c406 · f25c406
1 parent 1e8f87f
commit f25c406
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
@@ -1315,7 +1315,7 @@ public function getGroupedClassName($groupType, $classId, $groupRootNode = null)
      */
     public function getBlockClassName($blockType)
     {
-        if (strpos($blockType, '/')===false) {
+        if (strpos($blockType, '/') === false) {
             return $blockType;
         }
         return $this->getGroupedClassName('block', $blockType);
@@ -1365,11 +1365,10 @@ public function getResourceHelper($moduleName)
      */
     public function getModelClassName($modelClass)
     {
-        $modelClass = trim($modelClass);
-        if (strpos($modelClass, '/')===false) {
+        if (empty($modelClass) || (strpos($modelClass, '/') === false)) {
             return $modelClass;
         }
-        return $this->getGroupedClassName('model', $modelClass);
+        return $this->getGroupedClassName('model', trim($modelClass));
     }
 
     /**