diff options
author | MaurĂcio Meneghini Fauth <mauricio@fauth.dev> | 2022-08-19 04:54:53 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-19 04:54:53 +0300 |
commit | a2ef27823e27b612eaabda3e134692a5e5929220 (patch) | |
tree | 511b05a5d84472d1fd1322dd8bfc80b7dbf61083 /libraries | |
parent | aa20e5b493290957972e584825fd250c05e9e731 (diff) | |
parent | 2e126d7f6563a2ac5eb3a2eaf367d3ead5096f87 (diff) |
Merge pull request #17688 from kamil-tekiela/Fix-table-creation
Fix table creation
Fixes #17544
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/classes/Controllers/Table/CreateController.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 68ec6f0ed2..4edd0b565a 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -58,14 +58,12 @@ class CreateController extends AbstractController 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 @@ class CreateController extends AbstractController $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 @@ class CreateController extends AbstractController } // 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 @@ class CreateController extends AbstractController $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); } |