feature 2771: added backward compatibility with pre jquery ui 1.9 eff…

…ect file naming (combine script id issues) git-svn-id: http://piwigo.org/svn/trunk@18775 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Oct 28, 2012 · 8a44113 · 8a44113
1 parent efc5ab1
commit 8a44113
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/include/template.class.php b/include/template.class.php
@@ -598,6 +598,14 @@ function func_combine_script($params)
         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 @@ function block_footer_script($params, $content)
     $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'])