dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Classes : fixed noConflict jquery bug //thanks raph

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12548 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-01-19 09:17:08 +00:00
parent ca14d6231b
commit 40e8d5e572
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Media.php
+7 -3
View File
@@ -273,12 +273,16 @@ class MediaCore
$file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']);
// check if js files exists, if not try to load query from ajax.googleapis.com
$return = array();
if (file_exists($file_uri))
return self::getJSPath($file);
$return[] = self::getJSPath($file);
else
return self::getJSPath(Tools::getCurrentUrlProtocolPrefix().'ajax.googleapis.com/ajax/libs/jquery/'.$version.'/jquery'.($minifier ? '.min.js' : '.js'));
$return[] = self::getJSPath(Tools::getCurrentUrlProtocolPrefix().'ajax.googleapis.com/ajax/libs/jquery/'.$version.'/jquery'.($minifier ? '.min.js' : '.js'));
if ($addNoConflict)
return self::getJSPath(_PS_JS_DIR_.'jquery/jquery.noConflict.php?version='.$version);
$return[] = self::getJSPath(_PS_JS_DIR_.'jquery/jquery.noConflict.php?version='.$version);
return $return;
}
/**