Changeset 21818

Timestamp:

Mar 24, 2013, 7:49:06 AM (11 years ago)

Author:

rvelices

Message:

• remove code for backward compatibility (jquery ui effect + template variable)

Location:

trunk

Files:

• include/template.class.php (modified) (6 diffs)
• picture.php (modified) (4 diffs)

trunk/include/template.class.php

@@ -47 +47 @@
   const COMBINED_CSS_TAG = '<!-- COMBINED_CSS -->';
   var $css_by_priority = array();
-  
+
   var $picture_buttons = array();
   var $index_buttons = array();
@@ -603 +603 @@
     }
 
-    // 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'] ),
@@ -693 +686 @@
     { // 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,
@@ -875 +861 @@
     return $themeconfs[$dir];
   }
-  
+
   function add_picture_button($content, $rank)
   {
     $this->picture_buttons[$rank][] = $content;
   }
-  
+
   function add_index_button($content, $rank)
   {
     $this->index_buttons[$rank][] = $content;
   }
-  
+
   function parse_picture_buttons()
   {
@@ -896 +882 @@
     }
   }
-    
+
   function parse_index_buttons()
   {
@@ -907 +893 @@
     }
   }
-    
+
 }
 

trunk/picture.php

@@ -151 +151 @@
 {
   global $conf;
-  
+
   if ( !empty($content) )
   {// someone hooked us - so we skip;
@@ -378 +378 @@
           unset($_POST['content']);
         }
-        
+
         $edit_comment = $_GET['comment_to_edit'];
       }
@@ -774 +774 @@
                ),
       'U_PHOTO_ADMIN' => $url_admin,
-      'U_ADMIN' => $url_admin, // TEMP 2.5 for backward compatibility
       )
     );
@@ -987 +986 @@
   if (!isset($page['start'])) $page['start'] = 0;
   include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
-  if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu TEMP 2.5 for backward compatibility
 }