Merge branch 'xorg/maint'

diff --combined modules/xnetgrp.php
index 9fab4ae,744e4e0..0cafbff
--- 1/modules/xnetgrp.php
--- 2/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@@ -831,9 -831,13 +831,13 @@@ class XnetGrpModule extends PLModul
                           S::i('uid'), $globals->asso('id'));
              $admins = $globals->asso()->iterToNotify();
              $admin = $admins->next();
-             $to = $admin->bestEmail();
-             while ($admin = $admins->next()) {
-                 $to .= ', ' . $admin->bestEmail();
+             if (!is_null($admin)) {
+                 $to = $admin->bestEmail();
+                 while ($admin = $admins->next()) {
+                     $to .= ', ' . $admin->bestEmail();
+                 }
+             } else {
+                 $to = '';
              }
  
              $append = "\n"
@@@ -1079,20 -1083,6 +1083,20 @@@
  
              Group::subscribe($globals->asso('id'), $user->id());
              $this->removeSubscriptionRequest($user->id());
 +            
 +            // Check if the group has more than 1000 members, if so, disable the "send mail" function.
 +            $full_count = XDB::fetchOneCell('SELECT COUNT(*)
 +                                               FROM group_members
 +                                              WHERE asso_id = {?}',
 +                                $globals->asso('id'));
 +            if ($full_count > 999) {
 +                XDB::execute(
 +                    "UPDATE groups
 +                    SET disable_mails = 1
 +                    WHERE id = {?}",
 +                    $globals->asso('id')); 
 +            }
 +            
              if ($suggest_account_activation) {
                  pl_redirect('member/suggest/' . $user->login() . '/' . $email . '/' . $globals->asso('nom'));
              } else {