gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

Browse Source
This commit is contained in:
Weblate 2015-01-07 06:19:56 +01:00
commit 43d785393e
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
- bug #4687 Designer breaks without configuration storage
- bug #4686 Select elements flicker and selects something else
- bug #4689 Setup tool creates "pma__favorites" incorrectly
- bug #4685 Call to a member function isUserType() on a non-object
4.3.5.0 (2015-01-05)
- bug Auto-configuration: tables were not created automatically

4
libraries/Menu.class.php
View File

@ -507,13 +507,13 @@ class PMA_Menu
*/
private function _getServerTabs()
{
$is_superuser = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser();
$is_superuser = $GLOBALS['dbi']->isSuperuser();
$isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
|| $GLOBALS['dbi']->isUserType('create');
$binary_logs = null;
$notDrizzle = ! defined('PMA_DRIZZLE')
|| (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE);
if (isset($GLOBALS['dbi']) && $notDrizzle) {
if ($notDrizzle) {
if (PMA_Util::cacheExists('binary_logs')) {
$binary_logs = PMA_Util::cacheGet('binary_logs');
} else {

7
libraries/common.inc.php
View File

@ -1042,7 +1042,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
$_SESSION['tmpval']['previous_server'] = $GLOBALS['server'];
} // end server connecting
} else { // end server connecting
// No need to check for 'PMA_BYPASS_GET_INSTANCE' since this execution path
// applies only to initial login
$response = PMA_Response::getInstance();
$response->getFooter()->setMinimal();
}
/**
* check if profiling was requested and remember it