OM PR 4289

OpenMage/magento-lts#4289
MahoCommerce · Oct 23, 2024 · aacad11 · aacad11
1 parent 5c23047
commit aacad11
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php
@@ -100,7 +100,7 @@ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline)
     // PEAR specific message handling
     if (stripos($errfile . $errstr, 'pear') !== false) {
         // ignore strict and deprecated notices
-        if (($errno == E_STRICT) || ($errno == E_DEPRECATED)) {
+        if ((PHP_VERSION_ID < 80400 && $errno == E_STRICT) || ($errno == E_DEPRECATED)) {
             return true;
         }
         // ignore attempts to read system files when open_basedir is set
@@ -145,7 +145,7 @@ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline)
         case E_USER_NOTICE:
             $errorMessage .= 'User Notice';
             break;
-        case E_STRICT:
+        case 2048: // E_STRICT prior to PHP8.4
             $errorMessage .= 'Strict Notice';
             break;
         case E_RECOVERABLE_ERROR: