| Index: trunk/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -672,7 +672,8 @@ |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | /** |
| 676 | | - * Can the wiki change passwords in LDAP? |
| | 676 | + * Can the wiki change passwords in LDAP, or can the user |
| | 677 | + * change passwords locally? |
| 677 | 678 | * Return true if yes. |
| 678 | 679 | * |
| 679 | 680 | * @return bool |
| — | — | @@ -680,11 +681,12 @@ |
| 681 | 682 | */ |
| 682 | 683 | function allowPasswordChange() { |
| 683 | 684 | global $wgLDAPUpdateLDAP, $wgLDAPMailPassword; |
| | 685 | + global $wgLDAPUseLocal; |
| 684 | 686 | |
| 685 | 687 | $retval = false; |
| 686 | 688 | |
| 687 | 689 | // Local domains need to be able to change passwords |
| 688 | | - if ( 'local' == $_SESSION['wsDomain'] ) { |
| | 690 | + if ( (isset($wgLDAPUseLocal) && $wgLDAPUseLocal) && 'local' == $_SESSION['wsDomain'] ) { |
| 689 | 691 | $retval = true; |
| 690 | 692 | } |
| 691 | 693 | |
| Index: trunk/extensions/LdapAuthentication/README |
| — | — | @@ -1 +1 @@ |
| 2 | | -This authentication plugin allows MediaWiki to use an LDAP store as its user database for authentication, and some authorization. Full functionality and configuration information can be found at: http://meta.wikimedia.org/wiki/LDAP_Authentication |
| | 2 | +This authentication plugin allows MediaWiki to use an LDAP store as its user database for authentication, and some authorization. Full functionality and configuration information can be found at: http://www.mediawiki.org/wiki/Extension:LDAP_Authentication |