From 576decd1f4d4821af5382805e749ee5eb60da316 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 28 Aug 2021 01:46:45 +0200 Subject: [PATCH] Fix coding standard issues Signed-off-by: William Desportes --- libraries/classes/Relation.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index f5f101ad0c..4ca22cb198 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -2033,6 +2033,7 @@ class Relation // This is the case when the DB could be created but no tables just after // So just purge the cache and show the new configuration storage state $_SESSION['relation'][$GLOBALS['server']] = $this->checkRelationsParam(); + return true; } @@ -2095,6 +2096,7 @@ class Relation $createQueries = $this->getDefaultPmaTableNames(); if (! $this->dbi->selectDb($db, DatabaseInterface::CONNECT_CONTROL)) { $GLOBALS['message'] = $this->dbi->getError(DatabaseInterface::CONNECT_CONTROL); + return; } } @@ -2302,6 +2304,7 @@ class Relation global $cfg; $cfgStorageDbName = $cfg['Server']['pmadb'] ?? ''; + // Use "phpmyadmin" as a default database name to check to keep the behavior consistent return empty($cfgStorageDbName) ? 'phpmyadmin' : $cfgStorageDbName; }