From 274f65ad47dc68872415da7ad49d26af69b47a7a Mon Sep 17 00:00:00 2001
From: Fabrice Creuzot <code@luigifab.fr>
Date: Thu, 14 Oct 2021 19:27:52 +0200
Subject: [PATCH] Fix deprecated functionality: trim(): passing null to
 parameter #1 ($string) of type string is deprecated

---
 app/code/core/Mage/Core/Model/Config.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index c22827afb83..975821db3b7 100644
--- 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,13 @@ public function getResourceHelper($moduleName)
      */
     public function getModelClassName($modelClass)
     {
-        $modelClass = trim($modelClass);
-        if (strpos($modelClass, '/')===false) {
-            return $modelClass;
+        if (empty($modelClass)) {
+            return '';
         }
-        return $this->getGroupedClassName('model', $modelClass);
+        if (strpos($modelClass, '/') === false) {
+            return trim($modelClass);
+        }
+        return $this->getGroupedClassName('model', trim($modelClass));
     }
 
     /**