aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/userController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-04-11 17:31:07 +0200
committerGravatar GitHub <noreply@github.com> 2017-04-11 17:31:07 +0200
commitaa75cebbfe3dd2a6f8d8c9f3dfe72091e8381376 (patch)
treecc0907d84ec5ad72baed8e0fb6fe7d81176bbb3c /app/Controllers/userController.php
parente849de7296efbece490447cdceeed9726f10b33c (diff)
parent510045b3c554261a0a6434bfe73adac32b12cc81 (diff)
Merge pull request #1493 from Alkarex/multiuser-token
Multi-user token
Diffstat (limited to 'app/Controllers/userController.php')
-rw-r--r--app/Controllers/userController.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index ddc0c6fe4..ed30eb69f 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -74,6 +74,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash;
}
+ $current_token = FreshRSS_Context::$user_conf->token;
+ $token = Minz_Request::param('token', $current_token);
+ FreshRSS_Context::$user_conf->token = $token;
+
$ok &= FreshRSS_Context::$user_conf->save();
if ($ok) {