Merge branch '5.0-dev' into 5.0/upmerge-2023-11-17

joomla · Nov 18, 2023 · d5e30da · d5e30da
2 parents c7cde13 + 5e9aea0
commit d5e30da
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
@@ -315,21 +315,21 @@ public static function getInstance($type, $prefix = 'JTable', $config = [])
                     include_once $tryThis;
                 }
             }
+        }
 
-            if (!class_exists($tableClass) && class_exists($tableClassLegacy)) {
-                $tableClass = $tableClassLegacy;
-            }
+        if (!class_exists($tableClass) && class_exists($tableClassLegacy)) {
+            $tableClass = $tableClassLegacy;
+        }
 
-            if (!class_exists($tableClass)) {
-                /*
-                * If unable to find the class file in the Table include paths. Return false.
-                * The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in 3.6.3.
-                * In 4.0 an Exception (type to be determined) will be thrown.
-                * For more info see https://github.com/joomla/joomla-cms/issues/11570
-                */
+        if (!class_exists($tableClass)) {
+            /*
+            * If unable to find the class file in the Table include paths. Return false.
+            * The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in 3.6.3.
+            * In 6.0 an Exception (type to be determined) will be thrown.
+            * For more info see https://github.com/joomla/joomla-cms/issues/11570
+            */
 
-                return false;
-            }
+            return false;
         }
 
         // If a database object was passed in the configuration array use it, otherwise get the global one from Factory.