bacport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-27
   don't sync spouse name

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-28
   tiny error : sql -> res

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

diff --git a/include/synchro_ax.inc.php b/include/synchro_ax.inc.php
index 464c76a..880f01b 100644 (file)
--- a/include/synchro_ax.inc.php
+++ b/include/synchro_ax.inc.php
@@ -261,7 +261,7 @@ function import_from_ax($userax, $epouse=false, $mobile=false, $del_address=null
 function copy_from_ax($uid)
 {
      $uax = get_user_ax($uid);
-     import_from_ax($uax, true, true, null, array_keys($uax['adr']), null, array_keys($uax['adr_pro']), true); 
+     import_from_ax($uax, false, true, null, array_keys($uax['adr']), null, array_keys($uax['adr_pro']), true); 
 }
 
 // vim:set et sw=4 sts=4 sws=4:

diff --git a/include/validations/epouses.inc.php b/include/validations/epouses.inc.php
index 45d6227..35a4841 100644 (file)
--- a/include/validations/epouses.inc.php
+++ b/include/validations/epouses.inc.php
@@ -47,7 +47,7 @@ class EpouseReq extends Validate
         list($prenom)  = explode('.',$_forlife);
         $this->alias   = make_username($prenom, $this->epouse);
 
-        $sql = $globals->xdb->query("
+        $res = $globals->xdb->query("
                 SELECT  e.alias, u.epouse, a.id
                   FROM  auth_user_md5 as u
              LEFT JOIN  aliases       as e ON(e.type='alias' AND FIND_IN_SET('epouse',e.flags) AND e.id = u.user_id)