diff options
Diffstat (limited to 'libraries/Scripts.class.php')
| -rw-r--r-- | libraries/Scripts.class.php | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libraries/Scripts.class.php b/libraries/Scripts.class.php index 57ad677073..169192908b 100644 --- a/libraries/Scripts.class.php +++ b/libraries/Scripts.class.php @@ -54,7 +54,7 @@ class PMA_Scripts $dynamic_scripts = ""; $scripts = array(); foreach ($files as $value) { - if ($GLOBALS['PMA_String']->strpos($value['filename'], "?") !== false) { + if (/*overload*/mb_strpos($value['filename'], "?") !== false) { if ($value['before_statics'] === true) { $first_dynamic_scripts .= "<script type='text/javascript' src='js/" . $value['filename'] . "'></script>"; @@ -158,16 +158,13 @@ class PMA_Scripts */ private function _eventBlacklist($filename) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - - if ( $pmaString->strpos($filename, 'jquery') !== false - || $pmaString->strpos($filename, 'codemirror') !== false - || $pmaString->strpos($filename, 'messages.php') !== false - || $pmaString->strpos($filename, 'ajax.js') !== false - || $pmaString->strpos($filename, 'navigation.js') !== false - || $pmaString->strpos($filename, 'get_image.js.php') !== false - || $pmaString->strpos($filename, 'cross_framing_protection.js') !== false + if ( /*overload*/mb_strpos($filename, 'jquery') !== false + || /*overload*/mb_strpos($filename, 'codemirror') !== false + || /*overload*/mb_strpos($filename, 'messages.php') !== false + || /*overload*/mb_strpos($filename, 'ajax.js') !== false + || /*overload*/mb_strpos($filename, 'navigation.js') !== false + || /*overload*/mb_strpos($filename, 'get_image.js.php') !== false + || /*overload*/mb_strpos($filename, 'cross_framing_protection.js') !== false ) { return 0; } @@ -216,7 +213,7 @@ class PMA_Scripts $retval = array(); foreach ($this->_files as $file) { //If filename contains a "?", continue. - if ($GLOBALS['PMA_String']->strpos($file['filename'], "?") !== false) { + if (/*overload*/mb_strpos($file['filename'], "?") !== false) { continue; } |