(no commit message)

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index d565ada135a05baedf4f9db2f1eb484ae0b9aebc..4ce39df16a1524ecf3cdd3f458e9e20de430f3ad 100644 (file)
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -131,7 +131,7 @@ class commonDAOUtilisateur extends commonDAO {
                $wherec = $where;\r
                $where = '(';\r
                if (!is_null($this->q)) {\r
-                       $where = '';\r
+\r
 \r
                        if ($this->search_id) {\r
                                $where .= 'utilisateur_id=\'' . $this->con->escape($this->q) . '\' OR ';\r

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 9d61c3654f448ecd8a8f410e718f007199f9dd51..1f3168cfc38346947fdc2fa412dcf4ced5c6250f 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -188,16 +188,16 @@ class commonUrl {
                                $suggestions[] = $book->book_id . ' - ' . $book->nom;\r
                        }\r
                } elseif ($args[1] == 'wsuser') {\r
-                       $dao = new commonDAOClient($core->con);\r
+                       $dao = new commonDAOUtilisateur($core->con);\r
                        $dao->setSearch($q, true);\r
-                       $clients = $dao->getListe('utilisateur_id','ASC',null,null,' AND ws_grade>0',$core->user);\r
+                       $clients = $dao->getListe('utilisateur_id','ASC',  null, ' AND ws_grade>0', $core->user);\r
                        foreach($clients as $client) {\r
                                $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';\r
                        }\r
                } elseif ($args[1] == 'wsadmin') {\r
                        $dao = new commonDAOUtilisateur($core->con);\r
                        $dao->setSearch($q, true);\r
-                       $clients = $dao->getListe('utilisateur_id', 'ASC', null, null, 'AND ws_grade>2',$core->user);\r
+                       $clients = $dao->getListe('utilisateur_id', 'ASC',  null, 'AND ws_grade>2', $core->user);\r
                        foreach($clients as $client) {\r
                                $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';\r
                        }\r