diff options
| author | Zach Prezkuta <fermion@gmx.com> | 2013-01-06 19:34:54 -0700 |
|---|---|---|
| committer | Zach Prezkuta <fermion@gmx.com> | 2013-01-06 19:34:54 -0700 |
| commit | b4a95460e65dbadaf074a414a9e3d9367e109f19 (patch) | |
| tree | c5a88652557bf5e6ba18b6c1d6edc09740960736 /include | |
| parent | 4281a95cbcc6a6bc2eae9ec0b393af9b0ec7b739 (diff) | |
| download | volse-hubzilla-b4a95460e65dbadaf074a414a9e3d9367e109f19.tar.gz volse-hubzilla-b4a95460e65dbadaf074a414a9e3d9367e109f19.tar.bz2 volse-hubzilla-b4a95460e65dbadaf074a414a9e3d9367e109f19.zip | |
fix show-stopping bugs
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/friendica_smarty.php | 12 | ||||
| -rw-r--r-- | include/plugin.php | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 8ae13e0d8..cb79c180c 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -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']); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index b3f0d18a0..2f4694c58 100644 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -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'); diff --git a/include/plugin.php b/include/plugin.php index be238b78c..0395c1a8e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -1,5 +1,6 @@ <?php +require_once("include/friendica_smarty.php"); // install and uninstall plugin if (! function_exists('uninstall_plugin')){ |