aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/javascriptController.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 18:53:36 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 18:53:36 +0100
commitd3a93ea2905ae50a2365d293f9f3ef3e51bf5f30 (patch)
treefbf240e82b244fc19907529750dd8be912d97b4b /app/Controllers/javascriptController.php
parentd27efeec04c7c41cf0f52bc7f89879e66f2e44a9 (diff)
BREAKING FEATURE: Remove general in config
General attribute has been removed from system config. Now subattributes (e.g. environment, salt, title, etc.) are directly accessible. YOU HAVE TO FIX YOUR ./data/config.php file! - Remove the general array - Values inside this array must be kept - To see what it must look like, please have a look to ./data/config.default.php (but keep your values!!). See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/Controllers/javascriptController.php')
-rwxr-xr-xapp/Controllers/javascriptController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index dd9aa6189..acd3fef69 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -28,7 +28,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
$user = isset($_GET['user']) ? $_GET['user'] : '';
if (ctype_alnum($user)) {
try {
- $salt = FreshRSS_Context::$system_conf->general['salt'];
+ $salt = FreshRSS_Context::$system_conf->salt;
$conf = new FreshRSS_Configuration($user);
$s = $conf->passwordHash;
if (strlen($s) >= 60) {