Merge remote branch 'origin/platal-0.10.2'

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 100be7d..08ac167 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -44,7 +44,7 @@ class UserSet extends PlSet
         global $globals;
         parent::__construct('auth_user_md5 AS u',
                             (!empty($GLOBALS['IS_XNET_SITE']) ?
-                                'INNER JOIN groupex.membres AS gxm ON (u.user_id = gxm.uid
+                                'INNER JOIN #groupex#.membres AS gxm ON (u.user_id = gxm.uid
                                                                        AND gxm.asso_id = ' . $globals->asso('id') . ') ' : '')
                            . 'LEFT JOIN auth_user_quick AS q USING (user_id)' . $joins,
                             $where,