Merge branch 'QA_4_5'

This commit is contained in:
Madhura Jayaratne 2015-08-28 19:46:37 +10:00
commit 822ff85ff7
2 changed files with 2 additions and 4 deletions

View File

@ -96,6 +96,7 @@ phpMyAdmin - ChangeLog
+ issue #11414 Unclear export options / organization / hierarchy
Set minimum required PHP version to 5.5 (older versions are EOL)
- issue #11407 ALTER TABLE failing on import when table exists
- issue Do not export `sys` database when exporting server
4.4.15.0 (not yet released)
- issue #11411 Undefined "replace" function on numeric scalar

View File

@ -61,10 +61,7 @@ function PMA_getHtmlForExportSelectOptions($tmp_select = '')
}
foreach ($GLOBALS['pma']->databases as $current_db) {
if ($current_db == 'information_schema'
|| $current_db == 'performance_schema'
|| $current_db == 'mysql'
) {
if ($GLOBALS['dbi']->isSystemSchema($current_db, true)) {
continue;
}
if (isset($_GET['db_select'])) {