Remove the sub_part global variable

It's only used inside Util::getDbInfo() for pagination when not
exporting.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

19 files changed, 51 insertions, 131 deletions

diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php
index bc0d9572d7..de5ec33686 100644
--- a/libraries/classes/Controllers/Database/DesignerController.php
+++ b/libraries/classes/Controllers/Database/DesignerController.php
@@ -55,7 +55,6 @@ class DesignerController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
@@ -239,12 +238,11 @@ class DesignerController extends AbstractController
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,,
+            $GLOBALS['total_num_tables'],,,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+        ] = Util::getDbInfo($GLOBALS['db']);
 
         // Embed some data into HTML, later it will be read
         // by designer/init.js and converted to JS variables.
diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php
index b0d6c70632..208df75c69 100644
--- a/libraries/classes/Controllers/Database/EventsController.php
+++ b/libraries/classes/Controllers/Database/EventsController.php
@@ -39,7 +39,6 @@ final class EventsController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['errors'] = $GLOBALS['errors'] ?? null;
         $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
@@ -62,12 +61,11 @@ final class EventsController extends AbstractController
             [
                 $GLOBALS['tables'],
                 $GLOBALS['num_tables'],
-                $GLOBALS['total_num_tables'],
-                $GLOBALS['sub_part'],,,
+                $GLOBALS['total_num_tables'],,,
                 $GLOBALS['tooltip_truename'],
                 $GLOBALS['tooltip_aliasname'],
                 $GLOBALS['pos'],
-            ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+            ] = Util::getDbInfo($GLOBALS['db']);
         } elseif (strlen($GLOBALS['db']) > 0) {
             $this->dbi->selectDb($GLOBALS['db']);
         }
diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php
index 76444c327a..a0b260cad1 100644
--- a/libraries/classes/Controllers/Database/ExportController.php
+++ b/libraries/classes/Controllers/Database/ExportController.php
@@ -41,7 +41,6 @@ final class ExportController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
@@ -59,10 +58,6 @@ final class ExportController extends AbstractController
 
         $this->addScriptFiles(['export.js']);
 
-        // $sub_part is used in Util::getDbInfo() to see if we are coming from
-        // /database/export, in which case we don't obey $cfg['MaxTableList']
-        $GLOBALS['sub_part'] = '_export';
-
         $this->checkParameters(['db']);
 
         $GLOBALS['errorUrl'] = Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database');
@@ -77,12 +72,11 @@ final class ExportController extends AbstractController
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,,
+            $GLOBALS['total_num_tables'],,,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part']);
+        ] = Util::getDbInfo($GLOBALS['db'], false);
 
         // exit if no tables in db found
         if ($GLOBALS['num_tables'] < 1) {
diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php
index 2755939d3c..4b3a759bdc 100644
--- a/libraries/classes/Controllers/Database/ImportController.php
+++ b/libraries/classes/Controllers/Database/ImportController.php
@@ -43,7 +43,6 @@ final class ImportController extends AbstractController
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null;
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
 
@@ -65,12 +64,11 @@ final class ImportController extends AbstractController
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,,
+            $GLOBALS['total_num_tables'],,,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+        ] = Util::getDbInfo($GLOBALS['db']);
 
         [$GLOBALS['SESSION_KEY'], $uploadId] = Ajax::uploadProgressSetup();
 
diff --git a/libraries/classes/Controllers/Database/Operations/CollationController.php b/libraries/classes/Controllers/Database/Operations/CollationController.php
index 2d6d32d110..b9242225bb 100644
--- a/libraries/classes/Controllers/Database/Operations/CollationController.php
+++ b/libraries/classes/Controllers/Database/Operations/CollationController.php
@@ -69,7 +69,7 @@ final class CollationController extends AbstractController
          * Changes tables charset if requested by the user
          */
         if ($request->getParsedBodyParam('change_all_tables_collations') === 'on') {
-            [$tables] = Util::getDbInfo($GLOBALS['db'], '');
+            [$tables] = Util::getDbInfo($GLOBALS['db']);
             foreach ($tables as ['Name' => $tableName]) {
                 if ($this->dbi->getTable($GLOBALS['db'], $tableName)->isView()) {
                     // Skip views, we can not change the collation of a view.
diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php
index 031a8096f4..378bfa26de 100644
--- a/libraries/classes/Controllers/Database/OperationsController.php
+++ b/libraries/classes/Controllers/Database/OperationsController.php
@@ -80,7 +80,6 @@ class OperationsController extends AbstractController
         $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['db_collation'] = $GLOBALS['db_collation'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
@@ -286,19 +285,15 @@ class OperationsController extends AbstractController
 
         $GLOBALS['urlParams']['goto'] = Url::getFromRoute('/database/operations');
 
-        // Gets the database structure
-        $GLOBALS['sub_part'] = '_structure';
-
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,
+            $GLOBALS['total_num_tables'],,
             $isSystemSchema,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part']);
+        ] = Util::getDbInfo($GLOBALS['db']);
 
         $oldMessage = '';
         if (isset($GLOBALS['message'])) {
diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php
index 9f01338252..ae4a36d651 100644
--- a/libraries/classes/Controllers/Database/PrivilegesController.php
+++ b/libraries/classes/Controllers/Database/PrivilegesController.php
@@ -89,19 +89,16 @@ class PrivilegesController extends AbstractController
             )->getDisplay());
         }
 
-        // Gets the database structure
-        $GLOBALS['sub_part'] = '_structure';
         ob_start();
 
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,,
+            $GLOBALS['total_num_tables'],,,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($db->getName(), $GLOBALS['sub_part']);
+        ] = Util::getDbInfo($db->getName());
 
         $content = ob_get_clean();
         $this->response->addHTML($content . "\n");
diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php
index 3cb8996788..1bbb252cc1 100644
--- a/libraries/classes/Controllers/Database/QueryByExampleController.php
+++ b/libraries/classes/Controllers/Database/QueryByExampleController.php
@@ -46,7 +46,6 @@ class QueryByExampleController extends AbstractController
         $GLOBALS['savedSearch'] = $GLOBALS['savedSearch'] ?? null;
         $GLOBALS['currentSearchId'] = $GLOBALS['currentSearchId'] ?? null;
         $GLOBALS['goto'] = $GLOBALS['goto'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
@@ -145,8 +144,6 @@ class QueryByExampleController extends AbstractController
             }
         }
 
-        $GLOBALS['sub_part'] = '_qbe';
-
         $this->checkParameters(['db']);
 
         $GLOBALS['errorUrl'] = Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database');
@@ -161,12 +158,11 @@ class QueryByExampleController extends AbstractController
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,,
+            $GLOBALS['total_num_tables'],,,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part']);
+        ] = Util::getDbInfo($GLOBALS['db']);
 
         $databaseQbe = new Qbe(
             $this->relation,
diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php
index fb39aa7545..32661369dd 100644
--- a/libraries/classes/Controllers/Database/RoutinesController.php
+++ b/libraries/classes/Controllers/Database/RoutinesController.php
@@ -50,7 +50,6 @@ class RoutinesController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
@@ -91,12 +90,11 @@ class RoutinesController extends AbstractController
                 [
                     $GLOBALS['tables'],
                     $GLOBALS['num_tables'],
-                    $GLOBALS['total_num_tables'],
-                    $GLOBALS['sub_part'],,,
+                    $GLOBALS['total_num_tables'],,,
                     $GLOBALS['tooltip_truename'],
                     $GLOBALS['tooltip_aliasname'],
                     $GLOBALS['pos'],
-                ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+                ] = Util::getDbInfo($GLOBALS['db']);
             }
         } elseif (strlen($GLOBALS['db']) > 0) {
             $this->dbi->selectDb($GLOBALS['db']);
diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php
index ee27a48b5a..857913b718 100644
--- a/libraries/classes/Controllers/Database/SearchController.php
+++ b/libraries/classes/Controllers/Database/SearchController.php
@@ -34,7 +34,6 @@ class SearchController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
@@ -70,12 +69,11 @@ class SearchController extends AbstractController
             [
                 $GLOBALS['tables'],
                 $GLOBALS['num_tables'],
-                $GLOBALS['total_num_tables'],
-                $GLOBALS['sub_part'],,,
+                $GLOBALS['total_num_tables'],,,
                 $GLOBALS['tooltip_truename'],
                 $GLOBALS['tooltip_aliasname'],
                 $GLOBALS['pos'],
-            ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+            ] = Util::getDbInfo($GLOBALS['db']);
         }
 
         // Main search form has been submitted, get results
diff --git a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
index 7b8364d36f..fa25360ac1 100644
--- a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
+++ b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
@@ -46,7 +46,7 @@ final class RealRowCountController extends AbstractController
             return;
         }
 
-        [$tables] = Util::getDbInfo($GLOBALS['db'], '_structure');
+        [$tables] = Util::getDbInfo($GLOBALS['db']);
 
         // If there is a request to update all table's row count.
         if (! isset($parameters['real_row_count_all'])) {
diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php
index 0efc2c1f41..143e24d8aa 100644
--- a/libraries/classes/Controllers/Database/StructureController.php
+++ b/libraries/classes/Controllers/Database/StructureController.php
@@ -111,20 +111,18 @@ class StructureController extends AbstractController
     }
 
     /**
-     * Retrieves database information for further use
-     *
-     * @param string $subPart Page part name
+     * Retrieves database information for further use.
      */
-    private function getDatabaseInfo(string $subPart): void
+    private function getDatabaseInfo(): void
     {
         [
             $tables,
             $numTables,
-            $totalNumTables,,
+            $totalNumTables,
             $isShowStats,
             $dbIsSystemSchema,,,
             $position,
-        ] = Util::getDbInfo($GLOBALS['db'], $subPart);
+        ] = Util::getDbInfo($GLOBALS['db']);
 
         $this->tables = $tables;
         $this->numTables = $numTables;
@@ -155,7 +153,7 @@ class StructureController extends AbstractController
         $this->addScriptFiles(['database/structure.js', 'table/change.js']);
 
         // Gets the database structure
-        $this->getDatabaseInfo('_structure');
+        $this->getDatabaseInfo();
 
         // Checks if there are any tables to be shown on current page.
         // If there are no tables, the user is redirected to the last page
diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php
index d09184be4a..b7da0188d3 100644
--- a/libraries/classes/Controllers/Database/TrackingController.php
+++ b/libraries/classes/Controllers/Database/TrackingController.php
@@ -51,7 +51,6 @@ class TrackingController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
@@ -71,19 +70,15 @@ class TrackingController extends AbstractController
         $GLOBALS['urlParams']['goto'] = Url::getFromRoute('/table/tracking');
         $GLOBALS['urlParams']['back'] = Url::getFromRoute('/database/tracking');
 
-        // Get the database structure
-        $GLOBALS['sub_part'] = '_structure';
-
         [
             $GLOBALS['tables'],
             $GLOBALS['num_tables'],
-            $GLOBALS['total_num_tables'],
-            $GLOBALS['sub_part'],,
+            $GLOBALS['total_num_tables'],,
             $isSystemSchema,
             $GLOBALS['tooltip_truename'],
             $GLOBALS['tooltip_aliasname'],
             $GLOBALS['pos'],
-        ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part']);
+        ] = Util::getDbInfo($GLOBALS['db']);
 
         if (isset($_POST['delete_tracking'], $_POST['table'])) {
             Tracker::deleteTracking($GLOBALS['db'], $_POST['table']);
diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php
index 8d964bd509..8736bf75ab 100644
--- a/libraries/classes/Controllers/Database/TriggersController.php
+++ b/libraries/classes/Controllers/Database/TriggersController.php
@@ -44,7 +44,6 @@ class TriggersController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
@@ -81,12 +80,11 @@ class TriggersController extends AbstractController
                 [
                     $GLOBALS['tables'],
                     $GLOBALS['num_tables'],
-                    $GLOBALS['total_num_tables'],
-                    $GLOBALS['sub_part'],,,
+                    $GLOBALS['total_num_tables'],,,
                     $GLOBALS['tooltip_truename'],
                     $GLOBALS['tooltip_aliasname'],
                     $GLOBALS['pos'],
-                ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+                ] = Util::getDbInfo($GLOBALS['db']);
             }
         } elseif (strlen($GLOBALS['db']) > 0) {
             $this->dbi->selectDb($GLOBALS['db']);
diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php
index 943c8e3741..cb72b78166 100644
--- a/libraries/classes/Controllers/Server/PrivilegesController.php
+++ b/libraries/classes/Controllers/Server/PrivilegesController.php
@@ -73,7 +73,6 @@ class PrivilegesController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php
index ba6d60159d..249571d6e7 100644
--- a/libraries/classes/Controllers/Table/TriggersController.php
+++ b/libraries/classes/Controllers/Table/TriggersController.php
@@ -44,7 +44,6 @@ class TriggersController extends AbstractController
         $GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
         $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;
         $GLOBALS['total_num_tables'] = $GLOBALS['total_num_tables'] ?? null;
-        $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
         $GLOBALS['tooltip_truename'] = $GLOBALS['tooltip_truename'] ?? null;
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
@@ -81,12 +80,11 @@ class TriggersController extends AbstractController
                 [
                     $GLOBALS['tables'],
                     $GLOBALS['num_tables'],
-                    $GLOBALS['total_num_tables'],
-                    $GLOBALS['sub_part'],,,
+                    $GLOBALS['total_num_tables'],,,
                     $GLOBALS['tooltip_truename'],
                     $GLOBALS['tooltip_aliasname'],
                     $GLOBALS['pos'],
-                ] = Util::getDbInfo($GLOBALS['db'], $GLOBALS['sub_part'] ?? '');
+                ] = Util::getDbInfo($GLOBALS['db']);
             }
         } elseif (strlen($GLOBALS['db']) > 0) {
             $this->dbi->selectDb($GLOBALS['db']);
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 41ce36f251..5de93076b2 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -2068,15 +2068,13 @@ class Util
     }
 
     /**
-     * Gets the list of tables in the current db and information about these
-     * tables if possible
+     * Gets the list of tables in the current db and information about these tables if possible.
      *
-     * @param string $db      database name
-     * @param string $subPart part of script name
+     * @param string $db
      *
      * @return array
      */
-    public static function getDbInfo($db, string $subPart)
+    public static function getDbInfo($db, bool $isResultLimited = true)
     {
         /**
          * limits for table list
@@ -2191,7 +2189,7 @@ class Util
                 //  (needed for proper working of the MaxTableList feature)
                 $tables = $GLOBALS['dbi']->getTables($db);
                 $totalNumTables = count($tables);
-                if ($subPart !== '_export') {
+                if ($isResultLimited) {
                     // fetch the details for a possible limited subset
                     $limitOffset = $pos;
                     $limitCount = true;
@@ -2217,19 +2215,10 @@ class Util
             $totalNumTables = $numTables;
         }
 
-        /**
-         * If coming from a Show MySQL link on the home page,
-         * put something in $sub_part
-         */
-        if ($subPart === '') {
-            $subPart = '_structure';
-        }
-
         return [
             $tables,
             $numTables,
             $totalNumTables,
-            $subPart,
             $isShowStats,
             $isSystemSchema,
             $tooltipTrueName,
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d888ab2316..5a4578df17 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1083,8 +1083,7 @@
       <code>$_POST['selected_page']</code>
       <code>$_POST['selected_page']</code>
     </InvalidScalarArgument>
-    <MixedArgument occurrences="5">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
+    <MixedArgument occurrences="4">
       <code>$GLOBALS['success']</code>
       <code>$html</code>
       <code>$position['dbName']</code>
@@ -1096,7 +1095,7 @@
       <code>$position['tableName']</code>
       <code>$position['tableName']</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="22">
+    <MixedAssignment occurrences="21">
       <code>$GLOBALS['classes_side_menu']</code>
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['fullTableNames']</code>
@@ -1108,7 +1107,6 @@
       <code>$GLOBALS['script_display_field']</code>
       <code>$GLOBALS['script_tables']</code>
       <code>$GLOBALS['selected_page']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['success']</code>
       <code>$GLOBALS['tab_column']</code>
       <code>$GLOBALS['tab_pos']</code>
@@ -1201,15 +1199,11 @@
     </RiskyCast>
   </file>
   <file src="libraries/classes/Controllers/Database/EventsController.php">
-    <MixedArgument occurrences="1">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="9">
+    <MixedAssignment occurrences="8">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['errors']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -1233,12 +1227,11 @@
       <code>$each_table['Name']</code>
       <code>$each_table['Name']</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="12">
+    <MixedAssignment occurrences="11">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
       <code>$GLOBALS['single_table']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['table_select']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
@@ -1255,9 +1248,6 @@
     </PossiblyNullIterator>
   </file>
   <file src="libraries/classes/Controllers/Database/ImportController.php">
-    <MixedArgument occurrences="1">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
-    </MixedArgument>
     <MixedArrayAccess occurrences="2">
       <code>$_SESSION[$GLOBALS['SESSION_KEY']]['handler']</code>
       <code>$_SESSION[$GLOBALS['SESSION_KEY']]['handler']</code>
@@ -1266,11 +1256,10 @@
       <code>$_SESSION[$GLOBALS['SESSION_KEY']]</code>
       <code>$_SESSION[$GLOBALS['SESSION_KEY']]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="9">
+    <MixedAssignment occurrences="8">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -1318,7 +1307,7 @@
       <code>$GLOBALS['cfg']['AllowUserDropDatabase']</code>
       <code>$GLOBALS['cfg']['PmaNoRelation_DisableWarning']</code>
     </InvalidArrayOffset>
-    <MixedAssignment occurrences="18">
+    <MixedAssignment occurrences="17">
       <code>$GLOBALS['db_collation']</code>
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['export_sql_plugin']</code>
@@ -1330,7 +1319,6 @@
       <code>$GLOBALS['reload']</code>
       <code>$GLOBALS['single_table']</code>
       <code>$GLOBALS['sqlConstratints']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tables_full']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
@@ -1367,14 +1355,13 @@
     <InvalidArgument occurrences="1">
       <code>$_POST['searchId']</code>
     </InvalidArgument>
-    <MixedAssignment occurrences="11">
+    <MixedAssignment occurrences="10">
       <code>$GLOBALS['currentSearchId']</code>
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
       <code>$GLOBALS['savedSearch']</code>
       <code>$GLOBALS['savedSearchList']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -1390,16 +1377,14 @@
     </PossiblyInvalidCast>
   </file>
   <file src="libraries/classes/Controllers/Database/RoutinesController.php">
-    <MixedArgument occurrences="2">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
+    <MixedArgument occurrences="1">
       <code>$item</code>
     </MixedArgument>
-    <MixedAssignment occurrences="10">
+    <MixedAssignment occurrences="9">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['errors']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -1414,14 +1399,10 @@
     <InvalidArrayOffset occurrences="1">
       <code>$GLOBALS['cfg']['UseDbSearch']</code>
     </InvalidArrayOffset>
-    <MixedArgument occurrences="1">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="8">
+    <MixedAssignment occurrences="7">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -1845,11 +1826,10 @@
       <code>$entry['statement']</code>
       <code>$entry['username']</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="10">
+    <MixedAssignment occurrences="9">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -1885,15 +1865,11 @@
     </PossiblyNullIterator>
   </file>
   <file src="libraries/classes/Controllers/Database/TriggersController.php">
-    <MixedArgument occurrences="1">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="9">
+    <MixedAssignment occurrences="8">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['errors']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
@@ -2790,7 +2766,7 @@
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$GLOBALS['queries']</code>
     </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="29">
+    <MixedAssignment occurrences="28">
       <code>$GLOBALS['_add_user_error']</code>
       <code>$GLOBALS['db_and_table']</code>
       <code>$GLOBALS['dbname']</code>
@@ -2811,7 +2787,6 @@
       <code>$GLOBALS['ret_message']</code>
       <code>$GLOBALS['ret_queries']</code>
       <code>$GLOBALS['routinename']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tablename']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['title']</code>
@@ -4250,15 +4225,11 @@
     </PossiblyNullArgument>
   </file>
   <file src="libraries/classes/Controllers/Table/TriggersController.php">
-    <MixedArgument occurrences="1">
-      <code>$GLOBALS['sub_part'] ?? ''</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="9">
+    <MixedAssignment occurrences="8">
       <code>$GLOBALS['errorUrl']</code>
       <code>$GLOBALS['errors']</code>
       <code>$GLOBALS['num_tables']</code>
       <code>$GLOBALS['pos']</code>
-      <code>$GLOBALS['sub_part']</code>
       <code>$GLOBALS['tables']</code>
       <code>$GLOBALS['tooltip_aliasname']</code>
       <code>$GLOBALS['tooltip_truename']</code>
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index 728e7a682f..781a3a2183 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -2545,8 +2545,8 @@ class UtilTest extends AbstractTestCase
             'TABLE_COMMENT' => '',
             'TABLE_TYPE' => 'BASE TABLE',
         ];
-        $expected = [['test_table' => $tableInfo], 1, 1, '_structure', true, false, [], [], 0];
-        $actual = Util::getDbInfo('test_db', '');
+        $expected = [['test_table' => $tableInfo], 1, 1, true, false, [], [], 0];
+        $actual = Util::getDbInfo('test_db');
         $this->assertSame($expected, $actual);
     }