diff options
Diffstat (limited to 'app/Controllers/userController.php')
| -rw-r--r-- | app/Controllers/userController.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 96e4fec8c..69c1820e5 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -211,9 +211,20 @@ class FreshRSS_user_Controller extends Minz_ActionController { } } - public static function createUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain, $userConfig = array(), $insertDefaultFeeds = true) { - if (!is_array($userConfig)) { - $userConfig = array(); + public static function createUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain, $userConfigOverride = array(), $insertDefaultFeeds = true) { + $userConfig = array(); + + $customUserConfigPath = join_path(DATA_PATH, 'config-user.custom.php'); + if (file_exists($customUserConfigPath)) { + $customUserConfig = include($customUserConfigPath); + } + + if (is_array($customUserConfig)) { + $userConfig = $customUserConfig; + } + + if (is_array($userConfigOverride)) { + $userConfig = array_merge($userConfig, $userConfigOverride); } $ok = self::checkUsername($new_user_name); |