iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Remove known_template function.

Browse Source 
- Replace it by a modifier function: get_extent.

git-svn-id: http://piwigo.org/svn/trunk@2716 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2008-10-11 17:21:52 +00:00
parent 712b4e3d5c
commit a06bada6e8
2 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/template.class.php
View File

@@ -64,9 +64,9 @@ class Template {
$this->smarty->assign_by_ref( 'pwg', new PwgTemplateAdapter() );
$this->smarty->register_modifier( 'translate', array('Template', 'mod_translate') );
$this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') );
$this->smarty->register_modifier( 'get_extent', array(&$this, 'get_extent') );
$this->smarty->register_block('html_head', array(&$this, 'block_html_head') );
$this->smarty->register_function('known_script', array(&$this, 'func_known_script') );
$this->smarty->register_function('known_template', array(&$this, 'func_known_template') );
$this->smarty->register_prefilter( array('Template', 'prefilter_white_space') );
if ( $conf['compiled_template_cache_language'] )
{
@@ -153,13 +153,9 @@ class Template {
{
unset($this->files[$handle]);
}
elseif (isset($this->extents[$handle]))
{
$this->files[$handle] = $this->extents[$handle];
}
else
{
$this->files[$handle] = $filename;
$this->files[$handle] = $this->get_extent($filename, $handle);
}
}
return true;
@@ -209,6 +205,16 @@ class Template {
}
return true;
}
/** return template extension if exists */
function get_extent($filename='', $handle='')
{
if (isset($this->extents[$handle]))
{
$filename = $this->extents[$handle];
}
return $filename;
}
/** see smarty assign http://www.smarty.net/manual/en/api.assign.php */
function assign($tpl_var, $value = null)
@@ -409,34 +415,6 @@ class Template {
}
}
/**
* This smarty "known_template" functions allows to include template
* If extent[$params['id']] exists, include template extension
* else include $params[$file]
*/
function func_known_template($params, &$smarty )
{
if (!isset($params['file']))
{
$smarty->trigger_error("known_template: missing 'file' parameter");
return;
}
if (isset($params['id']) and isset($this->extents[$params['id']]))
{
$file = $this->extents[$params['id']];
}
else
{
$file = $params['file'];
}
return $smarty->_smarty_include(array(
'smarty_include_tpl_file' => $file,
'smarty_include_vars' => array()
));
}
static function prefilter_white_space($source, &$smarty)
{
$ld = $smarty->left_delimiter;

2
template/yoga/menubar.tpl
View File

@@ -4,7 +4,7 @@
{if ( not empty($block->template) or not empty($block->raw_content) )}
<dl id="{$id}">
{if not empty($block->template)}
{known_template id=$id file=$block->template }
{include file=$block->template|@get_extent:$id }
{else}
{$block->raw_content|@default}
{/if}