Changeset 17022


Ignore:
Timestamp:
07/25/12 19:26:26 (7 years ago)
Author:
rvelices
Message:

merge from trunk to 2.4

  • fix smartpocket : web service calls in admin not working on iphones
  • removed unused func params in template
Location:
branches/2.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/include/template.class.php

    r16279 r17022  
    530530   * html elements must appear in the <head> element 
    531531   */ 
    532   function block_html_head($params, $content, &$smarty, &$repeat) 
     532  function block_html_head($params, $content) 
    533533  { 
    534534    $content = trim($content); 
     
    539539  } 
    540540 
    541   function block_html_style($params, $content, &$smarty, &$repeat) 
     541  function block_html_style($params, $content) 
    542542  { 
    543543    $content = trim($content); 
     
    548548  } 
    549549 
    550   function func_define_derivative($params, &$smarty) 
     550  function func_define_derivative($params) 
    551551  { 
    552552    !empty($params['name']) or fatal_error('define_derivative missing name'); 
     
    554554    { 
    555555      $derivative = ImageStdParams::get_by_type($params['type']); 
    556       $smarty->assign( $params['name'], $derivative); 
     556      $this->smarty->assign( $params['name'], $derivative); 
    557557      return; 
    558558    } 
     
    586586    } 
    587587 
    588     $smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) ); 
     588    $this->smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) ); 
    589589  } 
    590590 
     
    601601        browser refresh 
    602602    */ 
    603   function func_combine_script($params, &$smarty) 
     603  function func_combine_script($params) 
    604604  { 
    605605    if (!isset($params['id'])) 
    606606    { 
    607       $smarty->trigger_error("combine_script: missing 'id' parameter", E_USER_ERROR); 
     607      $this->smarty->trigger_error("combine_script: missing 'id' parameter", E_USER_ERROR); 
    608608    } 
    609609    $load = 0; 
     
    615615        case 'footer': $load=1; break; 
    616616        case 'async': $load=2; break; 
    617         default: $smarty->trigger_error("combine_script: invalid 'load' parameter", E_USER_ERROR); 
     617        default: $this->smarty->trigger_error("combine_script: invalid 'load' parameter", E_USER_ERROR); 
    618618      } 
    619619    } 
     
    625625 
    626626 
    627   function func_get_combined_scripts($params, &$smarty) 
     627  function func_get_combined_scripts($params) 
    628628  { 
    629629    if (!isset($params['load'])) 
    630630    { 
    631       $smarty->trigger_error("get_combined_scripts: missing 'load' parameter", E_USER_ERROR); 
     631      $this->smarty->trigger_error("get_combined_scripts: missing 'load' parameter", E_USER_ERROR); 
    632632    } 
    633633    $load = $params['load']=='header' ? 0 : 1; 
     
    695695  } 
    696696 
    697   function block_footer_script($params, $content, &$smarty, &$repeat) 
     697  function block_footer_script($params, $content) 
    698698  { 
    699699    $content = trim($content); 
     
    715715        browser refresh 
    716716    */ 
    717   function func_combine_css($params, &$smarty) 
     717  function func_combine_css($params) 
    718718  { 
    719719    !empty($params['path']) || fatal_error('combine_css missing path'); 
     
    723723  } 
    724724 
    725   function func_get_combined_css($params, &$smarty) 
     725  function func_get_combined_css($params) 
    726726  { 
    727727    return 'echo '.var_export(self::COMBINED_CSS_TAG,true); 
  • branches/2.4/themes/smartpocket/themeconf.inc.php

    r13545 r17022  
    1414 
    1515// Redirect if page is not compatible with mobile theme 
    16 if (!in_array(script_basename(), array('index', 'register', 'profile', 'identification'))) 
     16if (!in_array(script_basename(), array('index', 'register', 'profile', 'identification', 'ws'))) 
    1717  redirect(duplicate_index_url()); 
    1818 
Note: See TracChangeset for help on using the changeset viewer.