mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2088 from lonalore/xup

Browse Source 
Issue #2083 - Fix for "user_xup_login" event triggering... loginProvi…
This commit is contained in:
Cameron
2016-12-01 14:01:19 -08:00
committed by GitHub
parent 666eab7a89 5ef0f56b8f
commit 3877c7b6b0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/user_handler.php
View File

@@ -1397,7 +1397,7 @@ class e_user_provider
}
$this->adapter = $this->hybridauth->authenticate($this->getProvider());
$check = e107::getUser()->setProvider($this)->loginProvider($this->userId(), false);
$check = e107::getUser()->setProvider($this)->loginProvider($this->userId());
if($redirectUrl)

9
e107_handlers/user_model.php
View File

@@ -1586,11 +1586,14 @@ class e_user extends e_user_model
$userdata = $userlogin->getUserData();
e107::getLog()->add('XUP Debug', (__CLASS__.':'.__METHOD__.'-'.__LINE__), E_LOG_INFORMATIVE, "XUP_DEBUG");
if(defset('E107_DEBUG_LEVEL', 0) > 0)
{
e107::getLog()->add('XUP Debug', (__CLASS__ . ':' . __METHOD__ . '-' . __LINE__), E_LOG_INFORMATIVE, "XUP_DEBUG");
}
$this->setSessionData(true)->setData($userdata);
e107::getEvent()->trigger('user_xup_login', $userdata);
e107::getEvent()->trigger('user_xup_login', $userdata);
return $this->isUser();
}
@@ -1757,6 +1760,8 @@ class e_user extends e_user_model
if($sql->update('user', $updateQry) !==false)
{
$updatedProfile = array_replace($user, $userdata);
e107::getEvent()->trigger('user_xup_updated', $updatedProfile);
e107::getLog()->add('User Profile Updated', $userdata, E_LOG_INFORMATIVE, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name']));
}
else