Changeset 21818


Ignore:
Timestamp:
03/24/13 07:49:06 (6 years ago)
Author:
rvelices
Message:
  • remove code for backward compatibility (jquery ui effect + template variable)
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/template.class.php

    r20370 r21818  
    4747  const COMBINED_CSS_TAG = '<!-- COMBINED_CSS -->'; 
    4848  var $css_by_priority = array(); 
    49    
     49 
    5050  var $picture_buttons = array(); 
    5151  var $index_buttons = array(); 
     
    603603    } 
    604604 
    605     // TEMP in 2.5 for backward compatibility 
    606     if(!empty($params['require'])) 
    607     { 
    608       $params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] ); 
    609       $params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] ); 
    610     } 
    611  
    612605    $this->scriptLoader->add( $params['id'], $load, 
    613606      empty($params['require']) ? array() : explode( ',', $params['require'] ), 
     
    693686    { // second call 
    694687 
    695       // TEMP in 2.5 for backward compatibility 
    696       if(!empty($params['require'])) 
    697       { 
    698         $params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] ); 
    699         $params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] ); 
    700       } 
    701  
    702688      $this->scriptLoader->add_inline( 
    703689        $content, 
     
    875861    return $themeconfs[$dir]; 
    876862  } 
    877    
     863 
    878864  function add_picture_button($content, $rank) 
    879865  { 
    880866    $this->picture_buttons[$rank][] = $content; 
    881867  } 
    882    
     868 
    883869  function add_index_button($content, $rank) 
    884870  { 
    885871    $this->index_buttons[$rank][] = $content; 
    886872  } 
    887    
     873 
    888874  function parse_picture_buttons() 
    889875  { 
     
    896882    } 
    897883  } 
    898      
     884 
    899885  function parse_index_buttons() 
    900886  { 
     
    907893    } 
    908894  } 
    909      
     895 
    910896} 
    911897 
  • trunk/picture.php

    r21039 r21818  
    151151{ 
    152152  global $conf; 
    153    
     153 
    154154  if ( !empty($content) ) 
    155155  {// someone hooked us - so we skip; 
     
    378378          unset($_POST['content']); 
    379379        } 
    380          
     380 
    381381        $edit_comment = $_GET['comment_to_edit']; 
    382382      } 
     
    774774               ), 
    775775      'U_PHOTO_ADMIN' => $url_admin, 
    776       'U_ADMIN' => $url_admin, // TEMP 2.5 for backward compatibility 
    777776      ) 
    778777    ); 
     
    987986  if (!isset($page['start'])) $page['start'] = 0; 
    988987  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
    989   if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu TEMP 2.5 for backward compatibility 
    990988} 
    991989 
Note: See TracChangeset for help on using the changeset viewer.