harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix show-stopping bugs

Browse Source
This commit is contained in:
Zach Prezkuta
2013-01-06 19:34:54 -07:00
parent 4281a95cbc
commit b4a95460e6
31 changed files with 46 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ItemObject.php
View File

@@ -204,7 +204,7 @@ class Item extends BaseObject {
$body = prepare_body($item,true);
if($a->theme['template_engine'] === 'internal') {
if($a->get_template_engine() === 'internal') {
$body_e = template_escape($body);
$name_e = template_escape($profile_name);
$title_e = template_escape($item['title']);

12
include/friendica_smarty.php
View File

@@ -14,15 +14,15 @@ class FriendicaSmarty extends Smarty {
// setTemplateDir can be set to an array, which Smarty will parse in order.
// The order is thus very important here
$template_dirs = array('theme' => "view/theme/$theme/smarty3/");
$template_dirs = array('theme' => "view/theme/$theme/tpl/smarty3/");
if( x($a->theme_info,"extends") )
$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/");
$template_dirs = $template_dirs + array('base' => 'view/smarty3/');
$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/tpl/smarty3/");
$template_dirs = $template_dirs + array('base' => 'view/tpl/smarty3/');
$this->setTemplateDir($template_dirs);
$this->setCompileDir('view/smarty3/compiled/');
$this->setConfigDir('view/smarty3/config/');
$this->setCacheDir('view/smarty3/cache/');
$this->setCompileDir('view/tpl/smarty3/compiled/');
$this->setConfigDir('view/tpl/smarty3/config/');
$this->setCacheDir('view/tpl/smarty3/cache/');
$this->left_delimiter = $a->get_template_ldelim('smarty3');
$this->right_delimiter = $a->get_template_rdelim('smarty3');

1
include/plugin.php
View File

@@ -1,5 +1,6 @@
<?php
require_once("include/friendica_smarty.php");
// install and uninstall plugin
if (! function_exists('uninstall_plugin')){