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

[-] CORE : fixed bug #PSCFV-5572 - getJqueryPluginCSSPath method does not pass folder argument

Browse Source
This commit is contained in:
vAugagneur
2012-11-23 16:00:17 +01:00
parent 037f0e6d3c
commit a25fa92e2e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Media.php
+5 -4
View File
@@ -356,7 +356,7 @@ class MediaCore
* @param mixed $name * @param mixed $name
* @return void * @return void
*/ */
public static function getJqueryPluginPath($name, $folder) public static function getJqueryPluginPath($name, $folder = null)
{ {
$plugin_path = array('js' => array(), 'css' => array()); $plugin_path = array('js' => array(), 'css' => array());
if ($folder === null) if ($folder === null)
@@ -371,7 +371,7 @@ class MediaCore
$plugin_path['js'] = Media::getJSPath($folder.$name.'/'.$file); $plugin_path['js'] = Media::getJSPath($folder.$name.'/'.$file);
else else
return false; return false;
$plugin_path['css'] = Media::getJqueryPluginCSSPath($name); $plugin_path['css'] = Media::getJqueryPluginCSSPath($name, $folder);
return $plugin_path; return $plugin_path;
} }
@@ -381,9 +381,10 @@ class MediaCore
* @param mixed $name * @param mixed $name
* @return void * @return void
*/ */
public static function getJqueryPluginCSSPath($name) public static function getJqueryPluginCSSPath($name, $folder)
{ {
$folder = _PS_JS_DIR_.'jquery/plugins/'; if ($folder === null)
$folder = _PS_JS_DIR_.'jquery/plugins/'; //set default folder
$file = 'jquery.'.$name.'.css'; $file = 'jquery.'.$name.'.css';
$url_data = parse_url($folder); $url_data = parse_url($folder);
$file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']); $file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']);