diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-07-25 17:26:26 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-07-25 17:26:26 +0000 |
| commit | 273f066dafc967ec5ff75d4a7664f65959e19a90 (patch) | |
| tree | 369ef599ce8671833c0405e45a135851961a7dd0 | |
| parent | c87ad378c2b85af91d5434f922460b8dfffc2385 (diff) | |
merge from trunk to 2.4
- fix smartpocket : web service calls in admin not working on iphones
- removed unused func params in template
git-svn-id: http://piwigo.org/svn/branches/2.4@17022 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/template.class.php | 26 | ||||
| -rw-r--r-- | themes/smartpocket/themeconf.inc.php | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/template.class.php b/include/template.class.php index b1707bca1..3bc386c80 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -529,7 +529,7 @@ class Template { * handy in order to respect strict standards when <style> and <link> * html elements must appear in the <head> element */ - function block_html_head($params, $content, &$smarty, &$repeat) + function block_html_head($params, $content) { $content = trim($content); if ( !empty($content) ) @@ -538,7 +538,7 @@ class Template { } } - function block_html_style($params, $content, &$smarty, &$repeat) + function block_html_style($params, $content) { $content = trim($content); if ( !empty($content) ) @@ -547,13 +547,13 @@ class Template { } } - function func_define_derivative($params, &$smarty) + function func_define_derivative($params) { !empty($params['name']) or fatal_error('define_derivative missing name'); if (isset($params['type'])) { $derivative = ImageStdParams::get_by_type($params['type']); - $smarty->assign( $params['name'], $derivative); + $this->smarty->assign( $params['name'], $derivative); return; } !empty($params['width']) or fatal_error('define_derivative missing width'); @@ -585,7 +585,7 @@ class Template { } } - $smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) ); + $this->smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) ); } /** @@ -600,11 +600,11 @@ class Template { * param version - optional - plugins could use this and change it in order to force a browser refresh */ - function func_combine_script($params, &$smarty) + function func_combine_script($params) { if (!isset($params['id'])) { - $smarty->trigger_error("combine_script: missing 'id' parameter", E_USER_ERROR); + $this->smarty->trigger_error("combine_script: missing 'id' parameter", E_USER_ERROR); } $load = 0; if (isset($params['load'])) @@ -614,7 +614,7 @@ class Template { case 'header': break; case 'footer': $load=1; break; case 'async': $load=2; break; - default: $smarty->trigger_error("combine_script: invalid 'load' parameter", E_USER_ERROR); + default: $this->smarty->trigger_error("combine_script: invalid 'load' parameter", E_USER_ERROR); } } $this->scriptLoader->add( $params['id'], $load, @@ -624,11 +624,11 @@ class Template { } - function func_get_combined_scripts($params, &$smarty) + function func_get_combined_scripts($params) { if (!isset($params['load'])) { - $smarty->trigger_error("get_combined_scripts: missing 'load' parameter", E_USER_ERROR); + $this->smarty->trigger_error("get_combined_scripts: missing 'load' parameter", E_USER_ERROR); } $load = $params['load']=='header' ? 0 : 1; $content = array(); @@ -694,7 +694,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa return embellish_url($ret); } - function block_footer_script($params, $content, &$smarty, &$repeat) + function block_footer_script($params, $content) { $content = trim($content); if ( !empty($content) ) @@ -714,7 +714,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa * param version - optional - plugins could use this and change it in order to force a browser refresh */ - function func_combine_css($params, &$smarty) + function func_combine_css($params) { !empty($params['path']) || fatal_error('combine_css missing path'); $order = (int)@$params['order']; @@ -722,7 +722,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa $this->css_by_priority[$order][] = array( $params['path'], $version); } - function func_get_combined_css($params, &$smarty) + function func_get_combined_css($params) { return 'echo '.var_export(self::COMBINED_CSS_TAG,true); } diff --git a/themes/smartpocket/themeconf.inc.php b/themes/smartpocket/themeconf.inc.php index 7cedbc21b..0c5f7397d 100644 --- a/themes/smartpocket/themeconf.inc.php +++ b/themes/smartpocket/themeconf.inc.php @@ -13,7 +13,7 @@ $themeconf = array( );
// Redirect if page is not compatible with mobile theme
-if (!in_array(script_basename(), array('index', 'register', 'profile', 'identification')))
+if (!in_array(script_basename(), array('index', 'register', 'profile', 'identification', 'ws')))
redirect(duplicate_index_url());
//Retrive all pictures on thumbnails page
|