GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

resolve conflicts

Browse Source 
darcs-hash:20081210014619-5ed1f-b78d0990f80f7fee6f31424bc1e366d08767af9d.gz
This commit is contained in:
Evan Prodromou 2008-12-09 20:46:19 -05:00
parent 407ce3bd8f
commit b9fdc2c419
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/finishopenidlogin.php
View File

@ -238,7 +238,7 @@ class FinishopenidloginAction extends Action {
$result = oid_link_user($user->id, $canonical, $display); $result = oid_link_user($user->id, $canonical, $display);
oid_set_last($display); oid_set_last($display);
common_set_user($user->nickname); common_set_user($user);
common_real_login(true); common_real_login(true);
if (isset($_SESSION['openid_rememberme']) && $_SESSION['openid_rememberme']) { if (isset($_SESSION['openid_rememberme']) && $_SESSION['openid_rememberme']) {
common_rememberme($user); common_rememberme($user);
@ -303,7 +303,6 @@ class FinishopenidloginAction extends Action {
# Try the passed-in nickname # Try the passed-in nickname
if ($sreg['nickname']) { if ($sreg['nickname']) {
$nickname = $this->nicknamize($sreg['nickname']); $nickname = $this->nicknamize($sreg['nickname']);
if ($this->is_new_nickname($nickname)) { if ($this->is_new_nickname($nickname)) {