adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 08:33:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

- allow template class to be instantiated with an empty theme (in plugins for example)

Browse Source 
- local_head must now be defined in the themeconf.inc.php otherwise not taken into account (avoid several calls to file_exists)
- renamed themeconf['theme'] to themeconf['name'] (this is what it is themeconf[theme] is confusing)

git-svn-id: http://piwigo.org/svn/trunk@5177 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-03-18 18:40:00 +00:00
parent 15fdea6925
commit 4f80b6095c
8 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/template.class.php
+13 -19
View File
@@ -24,15 +24,6 @@
require_once(PHPWG_ROOT_PATH.'include/smarty/libs/Smarty.class.php');
// migrate lang:XXX
// sed "s/{lang:\([^}]\+\)}/{\'\1\'|@translate}/g" my_template.tpl
// migrate change root level vars {XXX}
// sed "s/{pwg_root}/{ROOT_URL}/g" my_template.tpl
// migrate change root level vars {XXX}
// sed "s/{\([a-zA-Z_]\+\)}/{$\1}/g" my_template.tpl
// migrate all
// cat my_template.tpl | sed "s/{lang:\([^}]\+\)}/{\'\1\'|@translate}/g" | sed "s/{pwg_root}/{ROOT_URL}/g" | sed "s/{\([a-zA-Z_]\+\)}/{$\1}/g"
class Template {
@@ -48,7 +39,7 @@ class Template {
// Templates prefilter from external sources (plugins)
var $external_filters = array();
// used by html_head smarty block to add content before </head>
var $html_head_elements = array();
@@ -78,7 +69,10 @@ class Template {
}
$this->smarty->template_dir = array();
$this->set_theme($root, $theme, $path);
if ( !empty($theme) )
$this->set_theme($root, $theme, $path);
else
$this->set_template_dir($root);
$this->smarty->assign('lang_info', $lang_info);
@@ -103,10 +97,10 @@ class Template {
$this->set_theme($root, $themeconf['parent'], $path);
}
$tpl_var = array('name' => $themeconf['theme']);
if (file_exists($root.'/'.$theme.'/local_head.tpl'))
$tpl_var = array('name' => $themeconf['name']);
if (!empty($themeconf['local_head']) )
{
$tpl_var['local_head'] = realpath($root.'/'.$theme.'/local_head.tpl');
$tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );
}
$this->smarty->append('themes', $tpl_var);
$this->smarty->append('themeconf', $themeconf, true);
@@ -468,7 +462,7 @@ class Template {
$this->external_filters[$handle][$weight][] = array('outputfilter', $callback);
ksort($this->external_filters[$handle]);
}
/**
* This function actually triggers the filters on the tpl files.
* Called in the parse method.
@@ -479,9 +473,9 @@ class Template {
if (isset($this->external_filters[$handle]))
{
$compile_id = '';
foreach ($this->external_filters[$handle] as $filters)
foreach ($this->external_filters[$handle] as $filters)
{
foreach ($filters as $filter)
foreach ($filters as $filter)
{
list($type, $callback) = $filter;
$compile_id .= $type.( is_array($callback) ? implode('', $callback) : $callback );
@@ -496,9 +490,9 @@ class Template {
{
if (isset($this->external_filters[$handle]))
{
foreach ($this->external_filters[$handle] as $filters)
foreach ($this->external_filters[$handle] as $filters)
{
foreach ($filters as $filter)
foreach ($filters as $filter)
{
list($type, $callback) = $filter;
call_user_func(array($this->smarty, 'unregister_'.$type), $callback);