From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 9 Apr 2011 15:27:52 +0000 (+0200)
Subject: Fixes isMainMailDomain function.
X-Git-Tag: xorg/1.1.1~37^2~8
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ca2f19b8facc5de72604809c34ae64c800b79a13;p=platal.git

Fixes isMainMailDomain function.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/classes/user.php b/classes/user.php
index 304c1fa..cc82689 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -860,7 +860,7 @@ class User extends PlUser
 
         $is_main_domain = false;
         foreach (self::$sub_mail_domains as $sub_domain) {
-            $is_main_domain = $is_main_domain || $domain == ($sub_domain . $globals->mail->domain) && $domain == ($sub_domain . $globals->mail->domain2);
+            $is_main_domain = $is_main_domain || $domain == ($sub_domain . $globals->mail->domain) || $domain == ($sub_domain . $globals->mail->domain2);
         }
         return $is_main_domain;
     }