← Back to branch summary

~mahara-contributors/mahara-adminlang/adminlang-master

« back to all changes in this revision

Viewing changes to htdocs/auth/ldap/lib.php

  • Committer: Ruslan Kabalin
  • Date: 2011-08-03 14:54:09 UTC
  • Revision ID: git-v1:a3409b53a971ec3bad8b5d1329298046d9596381
Revert back to master brach.

The adminlang-master was mistakingly based on the mahara 1.3_STABLE. This is
required for easy merge with the master.

Command used:
for i in `git rev-list
f731cf9b2cf72b61ed6a317acab23a30b9046c8a..afb5850ba246f41b624c162e8d8e6e72c534f239`;
do git revert -n $i; done

Change-Id: I9db8553a66facfaca81492cd978f974c6e7b8892

Show diffs side-by-side

added added

removed removed

Lines of Context:
htdocs/auth/ldap/lib.php
118
118
            $ldap_login = @ldap_bind($ldapconnection, $ldap_user_dn, $password);
119
119
            ldap_close($ldapconnection);
120
120
            if ($ldap_login) {
121
 
                if ($user->id && $update) {
 
121
                if ($update) {
122
122
                    // Define ldap attributes
123
123
                    $ldapattributes = array();
124
124
                    $ldapattributes['firstname'] = $this->config['firstnamefield'];