aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/PageBuilder.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/PageBuilder.php')
-rw-r--r--application/PageBuilder.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 843cc0dc..88dbfa8a 100644
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -41,17 +41,17 @@ class PageBuilder
41 try { 41 try {
42 $version = ApplicationUtils::checkUpdate( 42 $version = ApplicationUtils::checkUpdate(
43 shaarli_version, 43 shaarli_version,
44 $this->conf->get('path.update_check'), 44 $this->conf->get('resource.update_check'),
45 $this->conf->get('general.check_updates_interval'), 45 $this->conf->get('updates.check_updates_interval'),
46 $this->conf->get('general.check_updates'), 46 $this->conf->get('updates.check_updates'),
47 isLoggedIn(), 47 isLoggedIn(),
48 $this->conf->get('general.check_updates_branch') 48 $this->conf->get('updates.check_updates_branch')
49 ); 49 );
50 $this->tpl->assign('newVersion', escape($version)); 50 $this->tpl->assign('newVersion', escape($version));
51 $this->tpl->assign('versionError', ''); 51 $this->tpl->assign('versionError', '');
52 52
53 } catch (Exception $exc) { 53 } catch (Exception $exc) {
54 logm($this->conf->get('path.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage()); 54 logm($this->conf->get('resource.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage());
55 $this->tpl->assign('newVersion', ''); 55 $this->tpl->assign('newVersion', '');
56 $this->tpl->assign('versionError', escape($exc->getMessage())); 56 $this->tpl->assign('versionError', escape($exc->getMessage()));
57 } 57 }
@@ -80,9 +80,9 @@ class PageBuilder
80 $this->tpl->assign('pagetitle', $this->conf->get('pagetitle')); 80 $this->tpl->assign('pagetitle', $this->conf->get('pagetitle'));
81 } 81 }
82 $this->tpl->assign('shaarlititle', $this->conf->get('title', 'Shaarli')); 82 $this->tpl->assign('shaarlititle', $this->conf->get('title', 'Shaarli'));
83 $this->tpl->assign('openshaarli', $this->conf->get('extras.open_shaarli', false)); 83 $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false));
84 $this->tpl->assign('showatom', $this->conf->get('extras.show_atom', false)); 84 $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false));
85 $this->tpl->assign('hide_timestamps', $this->conf->get('extras.hide_timestamps', false)); 85 $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
86 if (!empty($GLOBALS['plugin_errors'])) { 86 if (!empty($GLOBALS['plugin_errors'])) {
87 $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); 87 $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']);
88 } 88 }