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

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	classes/Memcached_DataObject.php
This commit is contained in:
Brion Vibber
2010-12-17 17:13:21 -08:00
parent bf59eaf602 fb8312ebf4
commit d8a3a88ec8
20 changed files with 466 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/LdapCommon/LdapCommon.php
View File

@@ -140,7 +140,7 @@ class LdapCommon
function checkPassword($username, $password)
{
$entry = $this->get_user($username);
$entry = $this->get_user($username,array('dn' => 'dn'));
if(!$entry){
return false;
}else{
@@ -168,7 +168,7 @@ class LdapCommon
//throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time'));
return false;
}
$entry = $this->get_user($username);
$entry = $this->get_user($username,array('dn' => 'dn'));
if(!$entry){
return false;
}else{