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

Merge pull request #223 from kasunchathuranga/Bug3835

Browse Source 
Fix bug #3835 Disabling CodeMirror in GUI settings does not actually dis...
This commit is contained in:
Marc Delisle 2013-04-01 04:37:14 -07:00
commit f29d9bccbf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/Header.class.php
View File

@ -158,12 +158,6 @@ class PMA_Header
$this->_scripts->addFile('jquery/jquery.ba-hashchange-1.3.js');
$this->_scripts->addFile('jquery/jquery.debounce-1.0.5.js');
$this->_scripts->addFile('jquery/jquery.menuResizer-1.0.js');
if ($GLOBALS['cfg']['CodemirrorEnable']) {
$this->_scripts->addFile('codemirror/lib/codemirror.js');
$this->_scripts->addFile('codemirror/mode/mysql/mysql.js');
}
$this->_scripts->addFile('rte.js');
// Localised strings
@ -353,6 +347,10 @@ class PMA_Header
$retval .= $this->_getMetaTags();
$retval .= $this->_getLinkTags();
$retval .= $this->getTitleTag();
if ($GLOBALS['cfg']['CodemirrorEnable']) {
$this->_scripts->addFile('codemirror/lib/codemirror.js');
$this->_scripts->addFile('codemirror/mode/mysql/mysql.js');
}
if ($this->_userprefsOfferImport) {
$this->_scripts->addFile('config.js');
}
@ -445,7 +443,7 @@ class PMA_Header
. "options inline-script eval-script;"
. "img-src 'self' data:; "
);
if (PMA_USR_BROWSER_AGENT == 'SAFARI'
if (PMA_USR_BROWSER_AGENT == 'SAFARI'
&& PMA_USR_BROWSER_VER < '6.0.0'
) {
header(