aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2016-07-26 08:43:28 +0200
committerzottel <github@zottel.net>2016-07-26 08:43:28 +0200
commit11b97af250d8c5db015a736e9349f29efb6662d7 (patch)
tree3fa43a2a23fffce85dac45343a4e9f8c24e0a1a3 /include
parentdcf2c07f298eec277b342f0ab3a5fa637285f0c0 (diff)
parent70dae328b5174543363163f8ca1c88c3c0af3cd8 (diff)
downloadvolse-hubzilla-11b97af250d8c5db015a736e9349f29efb6662d7.tar.gz
volse-hubzilla-11b97af250d8c5db015a736e9349f29efb6662d7.tar.bz2
volse-hubzilla-11b97af250d8c5db015a736e9349f29efb6662d7.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include')
-rw-r--r--include/api_auth.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/api_auth.php b/include/api_auth.php
index 7a71bad73..e5cd7cab3 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -64,8 +64,10 @@ function api_login(&$a){
}
}
+
+
if($record['account']) {
- authenticate_success($record);
+ authenticate_success($record['account']);
if($channel_login)
change_channel($channel_login);