mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-10 09:27:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

BREAKING FEATURE: Remove general in config

Browse Source 
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
This commit is contained in:
Marien Fressinaud
2015-01-06 18:53:36 +01:00
parent d27efeec04
commit d3a93ea290
18 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/javascriptController.php
View File

@@ -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) {