bugs dus au changement de table de web et mobile

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-422

diff --git a/htdocs/search.php b/htdocs/search.php
index 15d0d97..f3458bd 100644 (file)
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -49,8 +49,10 @@ if (Env::has('quick')) {
                        c.uid AS contact,
                       w.ni_id AS watch,
                        '.$qSearch->get_mark_statement().'
+
                  FROM  auth_user_md5  AS u
-            LEFT JOIN  aliases        AS a   ON (u.user_id = a.id AND a.type="a_vie")
+           INNER JOIN  auth_user_quick AS q  USING(user_id)
+           LEFT JOIN  aliases        AS a   ON (u.user_id = a.id AND a.type="a_vie")
             LEFT JOIN  contacts       AS c   ON (c.uid='.Session::getInt('uid').' AND c.contact=u.user_id)
             LEFT JOIN  watch_nonins   AS w   ON (w.ni_id=u.user_id AND w.uid='.Session::getInt('uid').')
             '.$globals->search->result_where_statement.'

diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index a6d4fbf..d8f5e7e 100644 (file)
--- a/include/search.classes.inc.php
+++ b/include/search.classes.inc.php
@@ -26,7 +26,7 @@ require_once("xorg.misc.inc.php");
 $globals->search->result_fields = '
                 u.user_id, u.promo, u.matricule, u.matricule_ax,
                if(u.epouse=\'\', u.nom, u.epouse) AS NomSortKey,
-                u.epouse,u.date,u.web,u.mobile,
+                u.epouse,u.date,q.profile_web AS web,q.profile_mobile AS mobile,
                 u.deces!=0 AS dcd,u.deces,
                u.perms IN (\'admin\',\'user\') AS inscrit,
                u.perms != \'pending\' AS wasinscrit,

diff --git a/include/synchro_ax.inc.php b/include/synchro_ax.inc.php
index 3e50610..464c76a 100644 (file)
--- a/include/synchro_ax.inc.php
+++ b/include/synchro_ax.inc.php
@@ -138,7 +138,7 @@ function import_from_ax($userax, $epouse=false, $mobile=false, $del_address=null
     }
     
     if ($mobile) {
-        $globals->xdb->execute("UPDATE auth_user_md5 SET mobile = {?} WHERE user_id = {?}", $userax['mobile'], $userax['uid']);
+        $globals->xdb->execute("UPDATE auth_user_quick SET profile_mobile = {?} WHERE user_id = {?}", $userax['mobile'], $userax['uid']);
     }
 
     if ($nationalite) {