Merge branch 'platal-1.0.0'

diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php
index 1ebafb5..406dfbf 100644 (file)
--- a/include/validations/paiements.inc.php
+++ b/include/validations/paiements.inc.php
@@ -187,7 +187,7 @@ Si le télépaiement n'est pas lié à un groupe ou supérieur à 51 euros, lais
                               $this->evt);
             list($nom, $diminutif, $evt) = $res->fetchOneRow();
             require_once dirname(__FILE__) . '/../../modules/xnetevents/xnetevents.inc.php';
-            $participants = get_event_participants(get_event_detail($this->evt, false, $this->asso_id), null, 'nom');
+            $participants = get_event_participants(get_event_detail($this->evt, false, $this->asso_id), null);
             foreach ($participants as &$u) {
                 if (!$u['notify_payment']) {
                     continue;

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index b416b28..0c0c645 100644 (file)
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -200,10 +200,9 @@ class Survey
         }
         $sql = 'SELECT v.id AS vid, a.question_id AS qid, a.answer AS answer
                   FROM survey_votes AS v
-             LEFT JOIN survey_answers AS a
-                    ON a.vote_id=v.id
+            INNER JOIN survey_answers AS a ON a.vote_id=v.id
                  WHERE v.survey_id={?}
-              ORDER BY vid ASC, qid ASC, answer ASC;';
+              ORDER BY vid ASC, qid ASC, answer ASC';
         $res = XDB::iterator($sql, $this->id); // retrieves all answers from database
         $vid = -1;
         $vid_ = 0;

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 12585a6..4fded5f 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -756,7 +756,7 @@ class XnetGrpModule extends PLModule
             return true;
         }
 
-        $mmlist = new MMList($user, $domain);
+        $mmlist = new MMList(S::user(), $domain);
         $listes = $mmlist->get_lists($user->forlifeEmail());
 
         $may_update = may_update();
@@ -870,7 +870,7 @@ class XnetGrpModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        $mmlist = new MMList($user, $globals->asso('mail_domain'));
+        $mmlist = new MMList(S::user(), $globals->asso('mail_domain'));
 
         if (Post::has('change')) {
             S::assert_xsrf_token();