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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-01-21 11:14:58 +05:30
commit 9cdcd992b1
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
- bug #4714 Forced ORDER BY for own sql statements
- bug #4721 Undefined property: stdClass::$version
- bug #4719 'only_db' not working
- bug #4700 Error text: Internal Server Error
4.3.7.0 (2015-01-15)
- bug #4694 js error on marking table as favorite in Safari (in private mode)

18
libraries/Response.class.php
View File

@ -303,14 +303,16 @@ class PMA_Response
// bug, contact Edward Cheng
$this->addJSON('_title', $this->getHeader()->getTitleTag());
$menuHash = $this->getHeader()->getMenu()->getHash();
$this->addJSON('_menuHash', $menuHash);
$hashes = array();
if (isset($_REQUEST['menuHashes'])) {
$hashes = explode('-', $_REQUEST['menuHashes']);
}
if (! in_array($menuHash, $hashes)) {
$this->addJSON('_menu', $this->getHeader()->getMenu()->getDisplay());
if (isset($GLOBALS['dbi'])) {
$menuHash = $this->getHeader()->getMenu()->getHash();
$this->addJSON('_menuHash', $menuHash);
$hashes = array();
if (isset($_REQUEST['menuHashes'])) {
$hashes = explode('-', $_REQUEST['menuHashes']);
}
if (! in_array($menuHash, $hashes)) {
$this->addJSON('_menu', $this->getHeader()->getMenu()->getDisplay());
}
}
$this->addJSON('_scripts', $this->getHeader()->getScripts()->getFiles());