diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index 4140ab628..e0fa68d85 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -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) diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php index ebbb97688..cad0e4f34 100644 --- a/e107_handlers/user_model.php +++ b/e107_handlers/user_model.php @@ -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