mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 05:14:34 -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

4
app/Controllers/userController.php
View File

@@ -118,7 +118,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$ok = ($new_user_name != '') && ctype_alnum($new_user_name);
if ($ok) {
$default_user = FreshRSS_Context::$system_conf->general['default_user'];
$default_user = FreshRSS_Context::$system_conf->default_user;
$ok &= (strcasecmp($new_user_name, $default_user) !== 0); //It is forbidden to alter the default user
$ok &= !in_array(strtoupper($new_user_name), array_map('strtoupper', listUsers())); //Not an existing user, case-insensitive
@@ -188,7 +188,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$user_data = join_path(DATA_PATH, 'users', $username);
if ($ok) {
$default_user = FreshRSS_Context::$system_conf->general['default_user'];
$default_user = FreshRSS_Context::$system_conf->default_user;
$ok &= (strcasecmp($username, $default_user) !== 0); //It is forbidden to delete the default user
}
if ($ok) {