diff options
author | Arthur <arthur@hoa.ro> | 2016-10-17 08:50:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-17 08:50:18 +0200 |
commit | 06eec9bf764662cd328627247a1f43e4abd3c5ad (patch) | |
tree | fd66a3e1cb4cd93aa80b6f04c43958623140a008 /application/PageBuilder.php | |
parent | bb70e690598d270951148e003a4dc253b05868b4 (diff) | |
parent | 7fde6de1212323418401c15efba06026c704ca87 (diff) | |
download | Shaarli-06eec9bf764662cd328627247a1f43e4abd3c5ad.tar.gz Shaarli-06eec9bf764662cd328627247a1f43e4abd3c5ad.tar.zst Shaarli-06eec9bf764662cd328627247a1f43e4abd3c5ad.zip |
Merge pull request #659 from ArthurHoaro/plugin-errors
New init function for plugins, supports errors reporting
Diffstat (limited to 'application/PageBuilder.php')
-rw-r--r-- | application/PageBuilder.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 42932f32..32c7f9f1 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php | |||
@@ -77,9 +77,6 @@ class PageBuilder | |||
77 | $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); | 77 | $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); |
78 | $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false)); | 78 | $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false)); |
79 | $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); | 79 | $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); |
80 | if (!empty($GLOBALS['plugin_errors'])) { | ||
81 | $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); | ||
82 | } | ||
83 | $this->tpl->assign('token', getToken($this->conf)); | 80 | $this->tpl->assign('token', getToken($this->conf)); |
84 | // To be removed with a proper theme configuration. | 81 | // To be removed with a proper theme configuration. |
85 | $this->tpl->assign('conf', $this->conf); | 82 | $this->tpl->assign('conf', $this->conf); |