From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 25 Feb 2010 16:36:23 +0000 (+0000)
Subject: merged patches
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5eef5b5a99bcd89912d8196bf56bf4e9b2ad5068;p=gosa.git

merged patches

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@15718 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index f0ceb781a..12755e1c2 100644
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -746,6 +746,10 @@ class mailAccount extends plugin
       }
 
       foreach ($attrs as $val){
+
+        // We can only replace strings here
+        if(!is_string($obj->$val)) continue;
+
         if(preg_match("/dateOfBirth/",$val)){
           if($obj->use_dob){
             $contents= preg_replace("/%$val/",date("Y-d-m",$obj->dateOfBirth),$contents);