diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2016-05-29 12:32:14 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2016-06-11 09:30:56 +0200 |
| commit | b74b96bfbd0b778ac50fd17f5e107c51435b1678 (patch) | |
| tree | fd2debc510c2c51e9b75e2081a31a10e9c02ad06 /application/PageBuilder.php | |
| parent | 684e662a58b02bde225e44d3677987b6fc3adf0b (diff) | |
| download | Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.tar.gz Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.tar.zst Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.zip | |
Adds ConfigJson which handle the configuration in JSON format.
Also use the Updater to make the transition
Diffstat (limited to 'application/PageBuilder.php')
| -rw-r--r-- | application/PageBuilder.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/application/PageBuilder.php b/application/PageBuilder.php index cf13c714..1d3ba9e8 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php | |||
| @@ -75,6 +75,7 @@ class PageBuilder | |||
| 75 | $this->tpl->assign('shaarlititle', $conf->get('title', 'Shaarli')); | 75 | $this->tpl->assign('shaarlititle', $conf->get('title', 'Shaarli')); |
| 76 | $this->tpl->assign('openshaarli', $conf->get('config.OPEN_SHAARLI', false)); | 76 | $this->tpl->assign('openshaarli', $conf->get('config.OPEN_SHAARLI', false)); |
| 77 | $this->tpl->assign('showatom', $conf->get('config.SHOW_ATOM', false)); | 77 | $this->tpl->assign('showatom', $conf->get('config.SHOW_ATOM', false)); |
| 78 | $this->tpl->assign('hide_timestamps', $conf->get('config.HIDE_TIMESTAMPS', false)); | ||
| 78 | // FIXME! Globals | 79 | // FIXME! Globals |
| 79 | if (!empty($GLOBALS['plugin_errors'])) { | 80 | if (!empty($GLOBALS['plugin_errors'])) { |
| 80 | $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); | 81 | $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); |