| Index: trunk/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -1785,9 +1785,9 @@ |
| 1786 | 1786 | if( $wgLDAPAutoAuthUsername != null ) { |
| 1787 | 1787 | $wgAuth->printDebug( "wgLDAPAutoAuthUsername is not null, adding hooks.", NONSENSITIVE ); |
| 1788 | 1788 | if ( version_compare( $wgVersion, '1.14.0', '<' ) ) { |
| | 1789 | + $wgHooks['UserLoadFromSession'][] = 'LdapAutoAuthentication::Authenticate'; |
| | 1790 | + } else { |
| 1789 | 1791 | $wgHooks['UserLoadAfterLoadFromSession'][] = 'LdapAutoAuthentication::Authenticate'; |
| 1790 | | - } else { |
| 1791 | | - $wgHooks['UserLoadFromSession'][] = 'LdapAutoAuthentication::Authenticate'; |
| 1792 | 1792 | } |
| 1793 | 1793 | $wgHooks['PersonalUrls'][] = 'LdapAutoAuthentication::NoLogout'; /* Disallow logout link */ |
| 1794 | 1794 | } |