Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
This commit is contained in:
commit
de4672d4d3
@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
|
||||
======================
|
||||
|
||||
4.2.12.0 (not yet released)
|
||||
- bug #4574 Blank/white page when JavaScript disabled
|
||||
|
||||
4.2.11.0 (2014-10-31)
|
||||
- bug ReferenceError: Table_onover is not defined
|
||||
|
||||
@ -374,6 +374,9 @@ class PMA_Header
|
||||
$this->_scripts->addFile('config.js');
|
||||
}
|
||||
$retval .= $this->_scripts->getDisplay();
|
||||
$retval .= '<noscript>';
|
||||
$retval .= '<style>html{display:block}</style>';
|
||||
$retval .= '</noscript>';
|
||||
$retval .= $this->_getBodyStart();
|
||||
if ($this->_menuEnabled && $GLOBALS['server'] > 0) {
|
||||
$nav = new PMA_Navigation();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user