aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/PageBuilder.php3
-rw-r--r--application/Updater.php16
-rw-r--r--application/config/ConfigManager.php2
3 files changed, 19 insertions, 2 deletions
diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 544aba7c..b133dee8 100644
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -75,7 +75,8 @@ class PageBuilder
75 } 75 }
76 $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli')); 76 $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli'));
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', true));
79 $this->tpl->assign('feed_type', $this->conf->get('feed.show_atom', true) !== false ? 'atom' : 'rss');
79 $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); 80 $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
80 $this->tpl->assign('token', getToken($this->conf)); 81 $this->tpl->assign('token', getToken($this->conf));
81 // To be removed with a proper theme configuration. 82 // To be removed with a proper theme configuration.
diff --git a/application/Updater.php b/application/Updater.php
index fd7e2073..efbfc832 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -378,6 +378,22 @@ class Updater
378 378
379 $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL')); 379 $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL'));
380 $this->conf->write($this->isLoggedIn); 380 $this->conf->write($this->isLoggedIn);
381
382 return true;
383 }
384
385 /**
386 * Use ATOM feed as default.
387 */
388 public function updateMethodAtomDefault()
389 {
390 if (!$this->conf->exists('feed.show_atom') || $this->conf->get('feed.show_atom') === true) {
391 return true;
392 }
393
394 $this->conf->set('feed.show_atom', true);
395 $this->conf->write($this->isLoggedIn);
396
381 return true; 397 return true;
382 } 398 }
383} 399}
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index f2097410..c5eeda08 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -317,7 +317,7 @@ class ConfigManager
317 $this->setEmpty('updates.check_updates_interval', 86400); 317 $this->setEmpty('updates.check_updates_interval', 86400);
318 318
319 $this->setEmpty('feed.rss_permalinks', true); 319 $this->setEmpty('feed.rss_permalinks', true);
320 $this->setEmpty('feed.show_atom', false); 320 $this->setEmpty('feed.show_atom', true);
321 321
322 $this->setEmpty('privacy.default_private_links', false); 322 $this->setEmpty('privacy.default_private_links', false);
323 $this->setEmpty('privacy.hide_public_links', false); 323 $this->setEmpty('privacy.hide_public_links', false);