friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

template: set smarty3 as default template engine in theme info array. 

remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
This commit is contained in:
Fabrixxm 2013-03-28 09:07:51 +01:00
parent 6fddd1cbbf
commit d36292c532
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot.php
View File

@ -383,7 +383,7 @@ if(! class_exists('App')) {
'force_max_items' => 0, 'force_max_items' => 0,
'thread_allow' => true, 'thread_allow' => true,
'stylesheet' => '', 'stylesheet' => '',
'template_engine' => 'internal', 'template_engine' => 'smarty3',
); );
// array of registered template engines ('name'=>'class name') // array of registered template engines ('name'=>'class name')
@ -755,7 +755,6 @@ if(! class_exists('App')) {
* @return object Template Engine instance * @return object Template Engine instance
*/ */
function template_engine($name = ''){ function template_engine($name = ''){
if ($name!=="") { if ($name!=="") {
$template_engine = $name; $template_engine = $name;
} else { } else {
@ -764,6 +763,7 @@ if(! class_exists('App')) {
$template_engine = $this->theme['template_engine']; $template_engine = $this->theme['template_engine'];
} }
} }
if (isset($this->template_engines[$template_engine])){ if (isset($this->template_engines[$template_engine])){
if(isset($this->template_engine_instance[$template_engine])){ if(isset($this->template_engine_instance[$template_engine])){
return $this->template_engine_instance[$template_engine]; return $this->template_engine_instance[$template_engine];
@ -783,7 +783,8 @@ if(! class_exists('App')) {
} }
function set_template_engine($engine = 'smarty3') { function set_template_engine($engine = 'smarty3') {
$this->theme['template_engine'] = $engine;
/*
$this->theme['template_engine'] = 'smarty3'; $this->theme['template_engine'] = 'smarty3';
switch($engine) { switch($engine) {
@ -794,6 +795,7 @@ if(! class_exists('App')) {
default: default:
break; break;
} }
*/
} }
function get_template_ldelim($engine = 'smarty3') { function get_template_ldelim($engine = 'smarty3') {

24
include/text.php
View File

@ -570,28 +570,6 @@ function get_markup_template($s, $root = '') {
$a->save_timestamp($stamp1, "file"); $a->save_timestamp($stamp1, "file");
return $template; return $template;
/*
if($a->theme['template_engine'] === 'smarty3') {
$template_file = get_template_file($a, 'smarty3/' . $s, $root);
$template = new FriendicaSmarty();
$template->filename = $template_file;
$a->save_timestamp($stamp1, "rendering");
return $template;
}
else {
$template_file = get_template_file($a, $s, $root);
$a->save_timestamp($stamp1, "rendering");
$stamp1 = microtime(true);
$content = file_get_contents($template_file);
$a->save_timestamp($stamp1, "file");
return $content;
}
*/
}} }}
if(! function_exists("get_template_file")) { if(! function_exists("get_template_file")) {
@ -613,6 +591,8 @@ function get_template_file($a, $filename, $root = '') {
$template_file = "{$root}view/theme/$theme/$filename"; $template_file = "{$root}view/theme/$theme/$filename";
elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename")) elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
$template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename"; $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
elseif (file_exists("{$root}/$filename"))
$template_file = "{$root}/$filename";
else else
$template_file = "{$root}view/$filename"; $template_file = "{$root}view/$filename";