diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-06-11 09:08:02 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2016-06-11 09:30:56 +0200 |
commit | 894a3c4bf38d8dcadb6941049b9167e5101805bd (patch) | |
tree | 6e158c07f620fced157dba0a51638590814b50bc /application/Updater.php | |
parent | 51def0d84955c7a951bd091eb5eeb3fce9deabd4 (diff) | |
download | Shaarli-894a3c4bf38d8dcadb6941049b9167e5101805bd.tar.gz Shaarli-894a3c4bf38d8dcadb6941049b9167e5101805bd.tar.zst Shaarli-894a3c4bf38d8dcadb6941049b9167e5101805bd.zip |
Rename configuration key for better sections
Diffstat (limited to 'application/Updater.php')
-rw-r--r-- | application/Updater.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/application/Updater.php b/application/Updater.php index b8940e41..fd45d17f 100644 --- a/application/Updater.php +++ b/application/Updater.php | |||
@@ -114,8 +114,8 @@ class Updater | |||
114 | */ | 114 | */ |
115 | public function updateMethodMergeDeprecatedConfigFile() | 115 | public function updateMethodMergeDeprecatedConfigFile() |
116 | { | 116 | { |
117 | if (is_file($this->conf->get('path.data_dir') . '/options.php')) { | 117 | if (is_file($this->conf->get('resource.data_dir') . '/options.php')) { |
118 | include $this->conf->get('path.data_dir') . '/options.php'; | 118 | include $this->conf->get('resource.data_dir') . '/options.php'; |
119 | 119 | ||
120 | // Load GLOBALS into config | 120 | // Load GLOBALS into config |
121 | $allowedKeys = array_merge(ConfigPhp::$ROOT_KEYS); | 121 | $allowedKeys = array_merge(ConfigPhp::$ROOT_KEYS); |
@@ -126,7 +126,7 @@ class Updater | |||
126 | } | 126 | } |
127 | } | 127 | } |
128 | $this->conf->write($this->isLoggedIn); | 128 | $this->conf->write($this->isLoggedIn); |
129 | unlink($this->conf->get('path.data_dir').'/options.php'); | 129 | unlink($this->conf->get('resource.data_dir').'/options.php'); |
130 | } | 130 | } |
131 | 131 | ||
132 | return true; | 132 | return true; |
@@ -143,7 +143,7 @@ class Updater | |||
143 | $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true))); | 143 | $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true))); |
144 | $this->linkDB[$link['linkdate']] = $link; | 144 | $this->linkDB[$link['linkdate']] = $link; |
145 | } | 145 | } |
146 | $this->linkDB->savedb($this->conf->get('path.page_cache')); | 146 | $this->linkDB->savedb($this->conf->get('resource.page_cache')); |
147 | return true; | 147 | return true; |
148 | } | 148 | } |
149 | 149 | ||
@@ -207,7 +207,7 @@ class Updater | |||
207 | try { | 207 | try { |
208 | $this->conf->set('general.title', escape($this->conf->get('general.title'))); | 208 | $this->conf->set('general.title', escape($this->conf->get('general.title'))); |
209 | $this->conf->set('general.header_link', escape($this->conf->get('general.header_link'))); | 209 | $this->conf->set('general.header_link', escape($this->conf->get('general.header_link'))); |
210 | $this->conf->set('extras.redirector', escape($this->conf->get('extras.redirector'))); | 210 | $this->conf->set('redirector.url', escape($this->conf->get('redirector.url'))); |
211 | $this->conf->write($this->isLoggedIn); | 211 | $this->conf->write($this->isLoggedIn); |
212 | } catch (Exception $e) { | 212 | } catch (Exception $e) { |
213 | error_log($e->getMessage()); | 213 | error_log($e->getMessage()); |