From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 18 Dec 2008 22:32:12 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.0'
X-Git-Tag: xorg/0.10.1~175
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=49bbddef42c7f9f4b356784141e3985c111778b6;hp=685794d2f0f57dbe9384facb48ec31b78d15641a;p=platal.git

Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/ChangeLog b/ChangeLog
index dc8d558..c8a6109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
 ================================================================================
+VERSION 0.10.1                                                        XX XX XXXX
+
+From 0.10.0 branch:
+
+    * Auth:
+        - Fix use of deprecated PlLogger in password recovery              -JAC
+
+    * Lists:
+        - #942: Fix missing MLs in ML listing                              -FRU
+        - #943: Fix adding member to a list                                -FRU
+
+    * Profile:
+        - Fix malformed query leading to error when adding an address      -FRU
+
+================================================================================
 VERSION 0.10.0                                                        11 12 2008
 
 New:
diff --git a/core b/core
index 4f67da2..e33bada 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 4f67da27edb0f631a7af1ccf5aa6e7ead84332dc
+Subproject commit e33badaa2e54d255a8ef5fc9e33c797349b7ca17
diff --git a/include/security.inc.php b/include/security.inc.php
index 64e3714..b202df4 100644
--- a/include/security.inc.php
+++ b/include/security.inc.php
@@ -85,7 +85,8 @@ function check_redirect($red = null)
 {
     require_once 'emails.inc.php';
     if (is_null($red)) {
-        $red = new Redirect(S::user());
+        $user = S::user();
+        $red = new Redirect($user);
     }
     if ($red->get_uid() == S::v('uid')) {
         $_SESSION['no_redirect'] = !$red->other_active('');
diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 05119da..2e60c61 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -29,7 +29,7 @@ function list_sort_owners(&$members, $tri_promo = true) {
     foreach($members as $mem) {
         list($m, $dom) = explode('@', $mem);
         $info = list_fetch_name($mem);
-        if (is_null($info['uid'])) {
+        if (!isset($info['uid']) || is_null($info['uid'])) {
             $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null));
         } else {
             $uid = $info['uid'];
@@ -66,9 +66,10 @@ function list_extract_members($members)
 // }}}
 // {{{ function list_sort_members
 
-function list_sort_members(&$members, $tri_promo = true)
+function list_sort_members($members, $tri_promo = true)
 {
-    return list_sort_owners(list_extract_members($members), $tri_promo);
+    $m = list_extract_members($members);
+    return list_sort_owners($m, $tri_promo);
 }
 
 // }}}