[debian-edu-commits] debian-edu/upstream/ 03/03: class_groupMail: Only set object into is_account state, if a mail pattern is provided.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa-plugin-mailaddress.

commit cf299547c52d73303b492353e82c3be2f2efac3e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 27 00:53:54 2015 +0200

    class_groupMail: Only set object into is_account state, if a mail pattern is provided.
---
 admin/groups/mailaddress/class_groupMail.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/groups/mailaddress/class_groupMail.inc b/admin/groups/mailaddress/class_groupMail.inc
index 1eb55e2..b3c0f49 100644
--- a/admin/groups/mailaddress/class_groupMail.inc
+++ b/admin/groups/mailaddress/class_groupMail.inc
@@ -567,12 +567,12 @@ class mailgroup extends plugin
             if (preg_match("/{%cn}/", $mail_pattern)){
                 $attrs['mail']= str_replace("{%cn}", $value, $mail_pattern);
             }
-        }
 
-        /* Add mail account data, if object is not in account state, yet
-         */
-        if(!$this->is_account && $this->acl_is_createable()){
-            $this->is_account= TRUE;
+            /* Add mail account data, if object is not in account state, yet
+             */
+            if(!$this->is_account && $this->acl_is_createable()){
+                $this->is_account= TRUE;
+            }
         }
 
         plugin::set_multi_edit_values($attrs);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/gosa-plugin-mailaddress.git