Merge pull request #17688 from kamil-tekiela/Fix-table-creation

MauricioFauth · web-flow · commit a2ef27823e27 · 2022-08-18T22:54:53.000-03:00
Fix table creation Fixes #17544
diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php
@@ -58,14 +58,12 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['num_fields'] = $GLOBALS['num_fields'] ?? null;
-        $GLOBALS['result'] = $GLOBALS['result'] ?? null;
         $this->checkParameters(['db']);
 
         $cfg = $this->config->settings;
 
         /* Check if database name is empty */
-        if (strlen($GLOBALS['db']) === 0) {
+        if ($GLOBALS['db'] === '') {
             Generator::mysqlDie(
                 __('The database name is empty!'),
                 '',
@@ -98,7 +96,7 @@ public function __invoke(ServerRequest $request): void
 
         $createAddField = new CreateAddField($this->dbi);
 
-        $GLOBALS['num_fields'] = $createAddField->getNumberOfFieldsFromRequest();
+        $numFields = $createAddField->getNumberOfFieldsFromRequest();
 
         /**
          * The form used to define the structure of the table has been submitted
@@ -120,9 +118,9 @@ public function __invoke(ServerRequest $request): void
             }
 
             // Executes the query
-            $GLOBALS['result'] = $this->dbi->tryQuery($GLOBALS['sql_query']);
+            $result = $this->dbi->tryQuery($GLOBALS['sql_query']);
 
-            if ($GLOBALS['result']) {
+            if ($result) {
                 // Update comment table for mime types [MIME]
                 if (isset($_POST['field_mimetype']) && is_array($_POST['field_mimetype']) && $cfg['BrowseMIME']) {
                     foreach ($_POST['field_mimetype'] as $fieldindex => $mimetype) {
@@ -158,9 +156,9 @@ public function __invoke(ServerRequest $request): void
 
         $this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js', 'indexes.js']);
 
-        $this->checkParameters(['server', 'db', 'table', 'num_fields']);
+        $this->checkParameters(['server', 'db']);
 
-        $templateData = $this->columnsDefinition->displayForm('/table/create', $GLOBALS['num_fields']);
+        $templateData = $this->columnsDefinition->displayForm('/table/create', $numFields);
 
         $this->render('columns_definitions/column_definitions_form', $templateData);
     }
