adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-03 16:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2771: added backward compatibility with pre jquery ui 1.9 effect file naming (combine script id issues)

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@18775 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-10-28 21:25:43 +00:00
parent efc5ab1bc7
commit 8a44113765
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/template.class.php
+16
View File
@@ -598,6 +598,14 @@ class Template {
default: $this->smarty->trigger_error("combine_script: invalid 'load' parameter", E_USER_ERROR);
}
}
// TEMP in 2.5 for backward compatibility
if(!empty($params['require']))
{
$params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] );
$params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] );
}
$this->scriptLoader->add( $params['id'], $load,
empty($params['require']) ? array() : explode( ',', $params['require'] ),
@$params['path'],
@@ -680,6 +688,14 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$content = trim($content);
if ( !empty($content) )
{ // second call
// TEMP in 2.5 for backward compatibility
if(!empty($params['require']))
{
$params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] );
$params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] );
}
$this->scriptLoader->add_inline(
$content,
empty($params['require']) ? array() : explode(',', $params['require'])