sunnysideup /
silverstripe-social_integration
| @@ 718-727 (lines=10) @@ | ||
| 715 | } |
|
| 716 | $member->write(); |
|
| 717 | $oldMember = Member::currentUser(); |
|
| 718 | if ($oldMember) { |
|
| 719 | if ($oldMember->ID != $member->ID) { |
|
| 720 | $oldMember->logout(); |
|
| 721 | $member->login($keepLoggedIn); |
|
| 722 | } else { |
|
| 723 | //already logged in - nothing to do. |
|
| 724 | } |
|
| 725 | } else { |
|
| 726 | $member->login($keepLoggedIn); |
|
| 727 | } |
|
| 728 | return $member; |
|
| 729 | } |
|
| 730 | ||
| @@ 668-677 (lines=10) @@ | ||
| 665 | } |
|
| 666 | $member->write(); |
|
| 667 | $oldMember = Member::currentUser(); |
|
| 668 | if ($oldMember) { |
|
| 669 | if ($oldMember->ID != $member->ID) { |
|
| 670 | $oldMember->logout(); |
|
| 671 | $member->login($keepLoggedIn); |
|
| 672 | } else { |
|
| 673 | //already logged in - nothing to do. |
|
| 674 | } |
|
| 675 | } else { |
|
| 676 | $member->login($keepLoggedIn); |
|
| 677 | } |
|
| 678 | return $member; |
|
| 679 | } |
|
| 680 | ||
