Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
This commit is contained in:
commit
f3f4f014d3
@ -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"
|
||||
|
||||
@ -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)
|
||||
)
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user