Closes #FS 104

u.* in mysql request was overriding matricule with ''
please look at it and put it into prod

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index a8ac60c..0fb86e2 100644 (file)
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: advanced_search.php,v 1.16 2004-10-15 09:42:37 x2000habouzit Exp $
+        $Id: advanced_search.php,v 1.17 2004-10-19 18:06:43 x2000bedo Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -108,12 +108,10 @@ else {
                        DISTINCT u.matricule,i.matricule_ax,
                        1 AS inscrit,
                        u.nom,
-                       u.epouse,
                        u.prenom,
                        u.promo,
                        i.deces!=0 AS decede,
                        a.alias AS forlife,
-                       u.date,
                        '.$globals->search_result_fields.'
                        c.uid AS contact
                  FROM  auth_user_md5  AS u

diff --git a/htdocs/search.php b/htdocs/search.php
index cd3c551..9da39d6 100644 (file)
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.php,v 1.29 2004-10-15 09:42:37 x2000habouzit Exp $
+        $Id: search.php,v 1.30 2004-10-19 18:06:43 x2000bedo Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -63,7 +63,6 @@ if (array_key_exists('rechercher', $_REQUEST)) {
     $sql = 'SELECT SQL_CALC_FOUND_ROWS
                        DISTINCT r.matricule,i.matricule_ax,
                        u.nom!="" AS inscrit,
-                       u.*,
                        UPPER(IF(u.nom!="",u.nom,i.nom)) AS nom,
                        IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
                        IF(u.promo!="",u.promo,i.promo) AS promo,

diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index 2ff4f90..15b58c9 100644 (file)
--- a/include/search.classes.inc.php
+++ b/include/search.classes.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.classes.inc.php,v 1.20 2004-10-16 15:13:12 x2000habouzit Exp $
+        $Id: search.classes.inc.php,v 1.21 2004-10-19 18:06:45 x2000bedo Exp $
  ***************************************************************************/
 
 require_once("xorg.misc.inc.php");
@@ -27,6 +27,7 @@ require_once("xorg.misc.inc.php");
  * Variables globales pour l'affichage des résultats de la recherche
  */
 $globals->search_result_fields = '
+                u.epouse,u.date,u.web,
                 ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                 ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                 e.entreprise, es.label AS secteur, ef.label AS fonction,