From: <ch...@us...> - 2011-08-17 22:02:54
|
Revision: 36297 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36297&view=rev Author: chealer Date: 2011-08-17 22:02:47 +0000 (Wed, 17 Aug 2011) Log Message: ----------- [REF] title block: only use global Smarty object where needed and avoid global $smarty; uses undocumented smarty member of template object instead (replaces change from r36140) thanks Rodney Rehm Modified Paths: -------------- trunk/lib/smarty_tiki/block.title.php Modified: trunk/lib/smarty_tiki/block.title.php =================================================================== --- trunk/lib/smarty_tiki/block.title.php 2011-08-17 21:55:39 UTC (rev 36296) +++ trunk/lib/smarty_tiki/block.title.php 2011-08-17 22:02:47 UTC (rev 36297) @@ -23,8 +23,8 @@ * */ -function smarty_block_title($params, $content, &$smarty, $repeat) { - global $prefs, $tiki_p_view_templates, $tiki_p_edit_templates, $tiki_p_admin, $smarty; +function smarty_block_title($params, $content, $template, $repeat) { + global $prefs, $tiki_p_view_templates, $tiki_p_edit_templates, $tiki_p_admin; if ( $repeat || $content == '' ) return; include_once('lib/smarty_tiki/function.icon.php'); @@ -32,12 +32,12 @@ if ( ! isset($params['help']) ) $params['help'] = ''; if ( ! isset($params['admpage']) ) $params['admpage'] = ''; if ( ! isset($params['url']) ) { - $smarty->loadPlugin('smarty_function_query'); - $params['url'] = smarty_function_query(array('_type' => 'absolute_path'), $smarty); + $template->loadPlugin('smarty_function_query'); + $params['url'] = smarty_function_query(array('_type' => 'absolute_path'), $template); } // Set the variable for the HTML title tag - $smarty->assign( 'headtitle', $content ); + $template->smarty->assign( 'headtitle', $content ); $class = 'pagetitle'; $current = current_object(); @@ -55,27 +55,27 @@ $html = '<h1>'; $html .= '<a class="' . $class . '"' . $metadata . ' href="' . $params['url'] . '">' . htmlspecialchars($content) . "</a>\n"; - if ($smarty->getTemplateVars('print_page') != 'y') { + if ($template->getTemplateVars('print_page') != 'y') { if ( $prefs['feature_help'] == 'y' && $prefs['helpurl'] != '' && $params['help'] != '' ) { $html .= '<a href="' . $prefs['helpurl'] . rawurlencode($params['help']) . '" class="titletips" title="' . tra('Help page:') . ' ' . htmlspecialchars($content) . '">' - . smarty_function_icon(array('_id' => 'help') , $smarty) + . smarty_function_icon(array('_id' => 'help') , $template) . "</a>\n"; } - if ($prefs['feature_edit_templates'] == 'y' && $tiki_p_edit_templates == 'y' && ($tpl = $smarty->getTemplateVars('mid'))) { + if ($prefs['feature_edit_templates'] == 'y' && $tiki_p_edit_templates == 'y' && ($tpl = $template->getTemplateVars('mid'))) { $html .= '<a href="tiki-edit_templates.php?template=' . $tpl . '" class="titletips" title="' . tra('View or edit tpl:') . ' ' . htmlspecialchars($content) . '">' - . smarty_function_icon(array('_id' => 'shape_square_edit', 'alt' => tra('Edit Template')), $smarty) + . smarty_function_icon(array('_id' => 'shape_square_edit', 'alt' => tra('Edit Template')), $template) . "</a>\n"; - } elseif ($prefs['feature_view_tpl'] == 'y' && $tiki_p_view_templates == 'y' && ($tpl = $smarty->getTemplateVars('mid'))) { + } elseif ($prefs['feature_view_tpl'] == 'y' && $tiki_p_view_templates == 'y' && ($tpl = $template->getTemplateVars('mid'))) { $html .= '<a href="tiki-edit_templates.php?template=' . $tpl . '" class="titletips" title="' . tra('View tpl:') . ' ' . htmlspecialchars($content) . '">' - . smarty_function_icon(array('_id' => 'shape_square', 'alt' => tra('View Template')), $smarty) + . smarty_function_icon(array('_id' => 'shape_square', 'alt' => tra('View Template')), $template) . "</a>\n"; } if ( $tiki_p_admin == 'y' && $params['admpage'] != '' ) { $html .= '<a class="titletips" href="tiki-admin.php?page=' . $params['admpage'] . '" title="' . tra('Admin page:') . ' ' . htmlspecialchars($content) . '">' - . smarty_function_icon(array('_id' => 'wrench', 'alt' => tra('Admin Feature')), $smarty) + . smarty_function_icon(array('_id' => 'wrench', 'alt' => tra('Admin Feature')), $template) . "</a>\n"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |