From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 5 Aug 2007 14:58:26 +0000 (+0000)
Subject: Close #698: Fix member/new ajax
X-Git-Tag: xorg/0.9.15~223
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e2b0a45c4117c2524b0b44e4a04ac230f180fd03;p=platal.git

Close #698: Fix member/new ajax

 ChangeLog           |    5 +++--
 modules/xnetgrp.php |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)



git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1901 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/ChangeLog b/ChangeLog
index c88b86f..ba98d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,10 +26,11 @@ Bug/Wish:
         - #694: Color of 'Promotion' groups                                -ALK
 
     * XnetGrp:
-        - #696: Don't forget non-X when counting members                   -Fru
+        - #696: Don't forget non-X when counting members                   -FRU
+        - #698: Fix the unregister user lister when adding a new member    -FRU
 
     * XnetEvents:
-        - #695: More details about payments                                -Fru
+        - #695: More details about payments                                -FRU
 
 From 0.9.14 branch:
 
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 3806a46..c8754d1 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -724,10 +724,12 @@ class XnetGrpModule extends PLModule
     {
         header('Content-Type: text/html; charset="UTF-8"');
         $page->changeTpl('xnetgrp/membres-new-search.tpl', NO_SKIN);
+        $res = null;
         if (Env::has('login')) {
             require_once 'user.func.inc.php';
             $res = get_not_registered_user(Env::v('login'), true);
-        } else {
+        }
+        if (is_null($res)) {
             list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::v('nom'), Env::v('prenom')));
             $where = "perms = 'pending'";
             if (!empty($nom)) {