[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[41155] branches/9.x/lib/userslib.php

[<re...@us...>]

Revision: 41155
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41155&view=rev
Author:   redflo
Date:     2012-04-28 23:44:25 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
[FIX] LDAP user and group syncronisation broken. See bug 4147

Modified Paths:
--------------
    branches/9.x/lib/userslib.php

Modified: branches/9.x/lib/userslib.php
===================================================================
--- branches/9.x/lib/userslib.php	2012-04-28 23:42:16 UTC (rev 41154)
+++ branches/9.x/lib/userslib.php	2012-04-28 23:44:25 UTC (rev 41155)
@@ -1472,8 +1472,7 @@
 			$current = 0;
 		}
 
-		// A LDAP synchronisation is not done in the 1st minute after login
-		if ( $tikilib->now - $current >= 60 && ( $prefs['syncGroupsWithDirectory'] == 'y' || $prefs['syncUsersWithDirectory'] == 'y' ) ) {
+		if ( $prefs['syncGroupsWithDirectory'] == 'y' || $prefs['syncUsersWithDirectory'] == 'y' ) {
 			$ret &= $this->ldap_sync_user_and_groups($user, $pass);
 		}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.