From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Wed, 5 Mar 2014 19:23:23 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.12~17
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=5f317a8d97f36d3a201149039b6996586b57826d

Merge branch 'xorg/maint'

Conflicts:
	include/newsletter.inc.php
---

5f317a8d97f36d3a201149039b6996586b57826d
diff --cc include/newsletter.inc.php
index ded8520,5ceabc0..313d98d
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@@ -1231,12 -1245,7 +1251,14 @@@ class NLIssu
       */
      public function sendTo($user, $hash = null)
      {
+         global $globals;
++
 +        // Don't send email to users without an address
 +        // Note: this would never happen when using sendToAll
 +        if (!$user->bestEmail()) {
 +            return;
 +        }
 +
          $this->fetchArticles();
  
          if (is_null($hash)) {