Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-05-26 13:50:11 +02:00
commit 360d8fabde

View File

@ -10,9 +10,6 @@
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/config/page_settings.class.php';
PMA_PageSettings::showGroup('DbStructure');
/**
* Function implementations for this script
@ -73,6 +70,10 @@ if (!PMA_DRIZZLE) {
$GLOBALS['replication_info']['slave']['status'] = false;
}
require_once 'libraries/config/page_settings.class.php';
PMA_PageSettings::showGroup('DbStructure');
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/mysql_charsets.inc.php';