From d007ed202d457ec90ea1523d205b706df19fa68b Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 3 Jun 2025 16:45:06 +0530
Subject: [PATCH] Fixed: issues caused due to null in strtolower in admin
 translation controller

---
 classes/Tools.php                                 | 6 +++---
 controllers/admin/AdminTranslationsController.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index fad6b092e..09916a166 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1734,7 +1734,7 @@ class ToolsCore
 
     public static function strtolower($str)
     {
-        if (is_array($str)) {
+        if (is_array($str) || is_null($str)) {
             return false;
         }
         if (function_exists('mb_strtolower')) {
@@ -1766,7 +1766,7 @@ class ToolsCore
 
     public static function strtoupper($str)
     {
-        if (is_array($str)) {
+        if (is_array($str) || is_null($str)) {
             return false;
         }
         if (function_exists('mb_strtoupper')) {
@@ -1777,7 +1777,7 @@ class ToolsCore
 
     public static function substr($str, $start, $length = false, $encoding = 'utf-8')
     {
-        if (is_array($str)) {
+        if (is_array($str) || is_null($str))
             return false;
         }
         if (function_exists('mb_substr')) {
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 36b5eca29..3d25592c4 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -1112,7 +1112,7 @@ class AdminTranslationsControllerCore extends AdminController
 
                 foreach ($matches as $key) {
                     $md5_key = md5($key);
-                    $module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key;
+                    $module_key = '<{'.Tools::strtolower($module_name).'}'.Tools::strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key;
                     $default_key = '<{'.Tools::strtolower($module_name).'}prestashop>'.Tools::strtolower($template_name).'_'.$md5_key;
                     // to avoid duplicate entry
                     if (!in_array($module_key, $array_check_duplicate)) {