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

Resolved issue 0000718: Add method "concat_var_from_handle" in template class

Browse Source 
Rename trigger name loc_before_* by loc_begin_*

Merge branch-1_7 2048:2050 into BSF

git-svn-id: http://piwigo.org/svn/trunk@2058 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-07-10 05:09:05 +00:00
parent f3b1fed9c6
commit 7183b5dffe
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/template.php
View File

@@ -155,7 +155,7 @@ class Template {
// actually compile the template now.
if (!isset($this->compiled_code[$handle]) || empty($this->compiled_code[$handle]))
{
trigger_action('loc_before_tpl_pparse', $handle, array(&$this));
trigger_action('loc_begin_tpl_pparse', $handle, array(&$this));
// Actually compile the code now.
$this->compiled_code[$handle] = $this->compile($this->uncompiled_code[$handle]);
}
@@ -179,7 +179,7 @@ class Template {
// actually compile the template now.
if (!isset($this->compiled_code[$handle]) || empty($this->compiled_code[$handle]))
{
trigger_action('loc_before_tpl_parse', $handle, array(&$this));
trigger_action('loc_begin_tpl_parse', $handle, array(&$this));
// Actually compile the code now.
$this->compiled_code[$handle] = $this->compile($this->uncompiled_code[$handle], true, '_str');
}
@@ -214,21 +214,23 @@ class Template {
*/
function assign_var_from_handle($varname, $handle)
{
if (!$this->loadfile($handle))
{
die("Template->assign_var_from_handle(): Couldn't load template file for handle $handle");
}
trigger_action('loc_before_tpl_assign_var_from_handle', $handle, array(&$this));
// Compile it, with the "no echo statements" option on.
$_str = "";
$code = $this->compile($this->uncompiled_code[$handle], true, '_str');
// evaluate the variable assignment.
eval($code);
// assign the value of the generated variable to the given varname.
$this->assign_var($varname, $_str);
trigger_action('loc_begin_tpl_assign_var_from_handle', $varname, $handle, array(&$this));
$this->assign_var($varname, $this->parse($handle, true));
return true;
}
/**
* Concat the uncompiled code for $handle as the value of $varname in the
* root-level. This can be used to effectively include a template in the
* middle of another template.
*
* Note that all desired assignments to the variables in $handle should be
* done BEFORE calling this function.
*/
function concat_var_from_handle($varname, $handle)
{
trigger_action('loc_begin_tpl_concat_var_from_handle', $varname, $handle, array(&$this));
$this->concat_var($varname, $this->parse($handle, true));
return true;
}