backport

diff --git a/ChangeLog b/ChangeLog
index 3d62cfd..4e98529 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@ Fixes (from 0.9.0 branch) :
                - corrects problem about mails that have non text/* parts                       -MC
                - rpc daemon can live everywhere                                                                        -MC
                - moderation : refusing/rejecting a mail informs other moderators       -MC
+       
+       * Fiche + Search :
+               - corrects bad handling of firms.                                                                       -MC
 
 ================================================================================
 VERSION 0.9.0                                                                                                       15 Oct 2004

diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index fdd60a6..93d5364 100644 (file)
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.php,v 1.13 2004-10-12 18:27:17 x2000habouzit Exp $
+        $Id: mescontacts.php,v 1.14 2004-10-16 15:13:12 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -70,7 +70,7 @@ $sql = "SELECT contact AS id,
         INNER JOIN auth_user_md5  AS a   ON (a.user_id = c.contact)
         INNER JOIN identification AS i   ON (a.matricule = i.matricule)
        INNER JOIN aliases        AS l   ON (a.user_id = l.id AND l.type='a_vie')
-        LEFT  JOIN entreprises    AS e   ON (e.entrid = 1 AND e.uid = a.user_id)
+        LEFT  JOIN entreprises    AS e   ON (e.entrid = 0 AND e.uid = a.user_id)
         LEFT  JOIN emploi_secteur AS es  ON (e.secteur = es.id)
         LEFT  JOIN emploi_naf     AS ef  ON (e.fonction = ef.id)
         LEFT  JOIN nationalites   AS n   ON (a.nationalite = n.id)

diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index 6641577..2ff4f90 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.19 2004-10-12 22:16:19 x2000bedo Exp $
+        $Id: search.classes.inc.php,v 1.20 2004-10-16 15:13:12 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once("xorg.misc.inc.php");
@@ -37,7 +37,7 @@ $globals->search_result_where_statement = '
                 LEFT JOIN  applis_def     AS ad0 ON (ad0.id = ai0.aid)
                 LEFT JOIN  applis_ins     AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1)
                 LEFT JOIN  applis_def     AS ad1 ON (ad1.id = ai1.aid)
-                LEFT JOIN  entreprises    AS e   ON (e.entrid = 1 AND e.uid = u.user_id)
+                LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
                 LEFT JOIN  emploi_secteur AS es  ON (e.secteur = es.id)
                 LEFT JOIN  emploi_naf     AS ef  ON (e.fonction = ef.id)
                 LEFT JOIN  nationalites   AS n   ON (u.nationalite = n.id)