diff options
author | ArthurHoaro <arthur@hoa.ro> | 2019-02-24 11:29:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-24 11:29:56 +0100 |
commit | 015314f3c6a1ce0b2c45fdb2fb0d36a15cab10f5 (patch) | |
tree | c805547e171afd615b90486fa8bd7656f5fb9090 /application/updater | |
parent | 0ee11e93907f0132e3b25a185093047bcd6b141d (diff) | |
parent | 520d29578c57e476ece3bdd20c286d196b7b61b4 (diff) | |
download | Shaarli-015314f3c6a1ce0b2c45fdb2fb0d36a15cab10f5.tar.gz Shaarli-015314f3c6a1ce0b2c45fdb2fb0d36a15cab10f5.tar.zst Shaarli-015314f3c6a1ce0b2c45fdb2fb0d36a15cab10f5.zip |
Merge pull request #1269 from ArthurHoaro/feature/remove-redirector
Remove the redirector setting
Diffstat (limited to 'application/updater')
-rw-r--r-- | application/updater/Updater.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/application/updater/Updater.php b/application/updater/Updater.php index f12e3516..beb9ea9b 100644 --- a/application/updater/Updater.php +++ b/application/updater/Updater.php | |||
@@ -218,7 +218,6 @@ class Updater | |||
218 | try { | 218 | try { |
219 | $this->conf->set('general.title', escape($this->conf->get('general.title'))); | 219 | $this->conf->set('general.title', escape($this->conf->get('general.title'))); |
220 | $this->conf->set('general.header_link', escape($this->conf->get('general.header_link'))); | 220 | $this->conf->set('general.header_link', escape($this->conf->get('general.header_link'))); |
221 | $this->conf->set('redirector.url', escape($this->conf->get('redirector.url'))); | ||
222 | $this->conf->write($this->isLoggedIn); | 221 | $this->conf->write($this->isLoggedIn); |
223 | } catch (Exception $e) { | 222 | } catch (Exception $e) { |
224 | error_log($e->getMessage()); | 223 | error_log($e->getMessage()); |
@@ -550,4 +549,14 @@ class Updater | |||
550 | 549 | ||
551 | return true; | 550 | return true; |
552 | } | 551 | } |
552 | |||
553 | /** | ||
554 | * Remove redirector settings. | ||
555 | */ | ||
556 | public function updateMethodRemoveRedirector() | ||
557 | { | ||
558 | $this->conf->remove('redirector'); | ||
559 | $this->conf->write(true); | ||
560 | return true; | ||
561 | } | ||
553 | } | 562 | } |