From 40203c993c5d6b57146f49b2340f815c163160b0 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Wed, 23 Jan 2013 15:44:15 +0000
Subject: [PATCH] Corrige l'overwrite de l'UID de membres.* par local.*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ca doit être un vieux bug qui traine ça...
---
 bureau/class/m_admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bureau/class/m_admin.php b/bureau/class/m_admin.php
index 715afb21..fb312e6b 100644
--- a/bureau/class/m_admin.php
+++ b/bureau/class/m_admin.php
@@ -85,9 +85,9 @@ class m_admin {
 
     if (!isset($lst_users_properties) || empty($lst_users_properties) || !is_array($lst_users_properties) || $recheck ) {
       $lst_users_properties=array();
-      $db->query("SELECT m.*, l.*, parent.login as parentlogin FROM membres as m LEFT JOIN membres as parent ON (parent.uid = m.creator) LEFT JOIN local as l ON (m.uid = l.uid) ;");
+      $db->query("SELECT m.uid as muid, l.*, m.*, parent.login as parentlogin FROM membres as m LEFT JOIN membres as parent ON (parent.uid = m.creator) LEFT JOIN local as l ON (m.uid = l.uid) ;");
        while ($db->next_record()) {
-         $lst_users_properties[$db->f('uid')]=$db->Record;
+         $lst_users_properties[$db->f('muid')]=$db->Record;
        }
     }