From e30d15d3b8cf7978f751aec6d4db3bc0a55e3303 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 30 Dec 2014 11:46:48 -0500 Subject: [PATCH] Bug in Auto-configuration: tables were not created automatically Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/core.lib.php | 2 +- libraries/relation.lib.php | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index df6d4a95f7..222b525166 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.5.0 (not yet released) +- bug Auto-configuration: tables were not created automatically 4.3.4.0 (2014-12-29) - bug #4653 Always connection error was shown, on /setup at tab "configuration storage" diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 296c461184..2d00fb3e60 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -997,7 +997,7 @@ function PMA_checkAndFixPMATablesInCurrentDb() && empty($GLOBALS['cfg']['Server']['pmadb']) ) { $default_tables = PMA_getDefaultPMATableNames(); - if (PMA_searchPMATablesInDb( + if (! PMA_foundTablesInDb( $GLOBALS['db'], array_keys($default_tables) ) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index f4c5987e26..61076a3ff7 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1774,14 +1774,14 @@ function PMA_searchColumnInForeigners($foreigners, $column) } /** - * Searches a DB for the existence of PMA tables. + * Whether we found a set of tables in the specified db * * @param string $db Database - * @param array $tables Default table names + * @param array $tables Table names * - * @return bool + * @return bool true if we found all of the tables in $db */ -function PMA_searchPMATablesInDb($db, $tables) +function PMA_foundTablesInDb($db, $tables) { $tab_rs = $GLOBALS['dbi']->getTables($db);