From 40e8d5e57290f2ca9b3eaeef30293de4a6d2fab2 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 19 Jan 2012 09:17:08 +0000 Subject: [PATCH] [-] Classes : fixed noConflict jquery bug //thanks raph git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12548 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Media.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/Media.php b/classes/Media.php index fcccefc33..f80a88710 100755 --- a/classes/Media.php +++ b/classes/Media.php @@ -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; } /**