| Index: trunk/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -1669,7 +1669,7 @@ |
| 1670 | 1670 | //They already with us? If so, quit this function. |
| 1671 | 1671 | if( $tmpuser->isLoggedIn() ) { |
| 1672 | 1672 | $wgAuth->printDebug( "User is already logged in.", self::NONSENSITIVE ); |
| 1673 | | - return; |
| | 1673 | + return true; |
| 1674 | 1674 | } |
| 1675 | 1675 | |
| 1676 | 1676 | //Let regular authentication plugins configure themselves for auto |
| — | — | @@ -1683,7 +1683,7 @@ |
| 1684 | 1684 | //If the user doesn't exist in LDAP, there isn't much reason to |
| 1685 | 1685 | //go any further. |
| 1686 | 1686 | $wgAuth->printDebug("User wasn't found in LDAP, exiting.", self::NONSENSITIVE ); |
| 1687 | | - return; |
| | 1687 | + return false; |
| 1688 | 1688 | } |
| 1689 | 1689 | |
| 1690 | 1690 | //We need the username that MediaWiki will always use, *not* the one we |
| — | — | @@ -1697,7 +1697,7 @@ |
| 1698 | 1698 | |
| 1699 | 1699 | if ( $tmpuser == null ) { |
| 1700 | 1700 | $wgAuth->printDebug( "Username is not a valid MediaWiki username.", self::NONSENSITIVE ); |
| 1701 | | - return; |
| | 1701 | + return false; |
| 1702 | 1702 | } |
| 1703 | 1703 | |
| 1704 | 1704 | //If exists, log them in |
| — | — | @@ -1707,7 +1707,7 @@ |
| 1708 | 1708 | $wgAuth->updateUser( $wgUser ); |
| 1709 | 1709 | $wgUser->setCookies(); |
| 1710 | 1710 | $wgUser->setupSession(); |
| 1711 | | - return; |
| | 1711 | + return true; |
| 1712 | 1712 | } |
| 1713 | 1713 | $wgAuth->printDebug( "User does not exist in local database; creating.", self::NONSENSITIVE ); |
| 1714 | 1714 | |
| — | — | @@ -1741,5 +1741,7 @@ |
| 1742 | 1742 | //Initialize the user |
| 1743 | 1743 | $wgUser->setupSession(); |
| 1744 | 1744 | $wgUser->setCookies(); |
| | 1745 | + |
| | 1746 | + return true; |
| 1745 | 1747 | } |
| 1746 | 1748 | ?> |