gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invert the logic to make it easier to understand

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-04-02 23:14:45 +01:00
parent aef2a96012
commit 49cb7e89b2
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libraries/classes/ConfigStorage/Relation.php
View File

@ -1572,29 +1572,28 @@ class Relation
// use the possible replaced name first and fallback on the table name
// if no replacement exists
if (! in_array($tableNameReplacements[$table] ?? $table, $existingTables)) {
if ($create) {
$this->dbi->tryQuery($createQueries[$table], Connection::TYPE_CONTROL);
$error = $this->dbi->getError(Connection::TYPE_CONTROL);
if ($error) {
$GLOBALS['message'] = $error;
return;
}
$foundOne = true;
if (empty($GLOBALS['cfg']['Server'][$feature])) {
// Do not override a user defined value, only fill if empty
$GLOBALS['cfg']['Server'][$feature] = $table;
}
if (! $create) {
continue;
}
} else {
$foundOne = true;
if (empty($GLOBALS['cfg']['Server'][$feature])) {
// Do not override a user defined value, only fill if empty
$GLOBALS['cfg']['Server'][$feature] = $table;
$this->dbi->tryQuery($createQueries[$table], Connection::TYPE_CONTROL);
$error = $this->dbi->getError(Connection::TYPE_CONTROL);
if ($error) {
$GLOBALS['message'] = $error;
return;
}
}
$foundOne = true;
// Do not override a user defined value, only fill if empty
if (isset($GLOBALS['cfg']['Server'][$feature]) && $GLOBALS['cfg']['Server'][$feature] !== '') {
continue;
}
$GLOBALS['cfg']['Server'][$feature] = $table;
}
if (! $foundOne) {