Fixed error 'calling function on non object' if we use the browser back button after...

Fixed vacation address loading

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

diff --git a/include/sieve/class_sieveElement_Vacation.inc b/include/sieve/class_sieveElement_Vacation.inc
index 3cb1b3929cb3da3d4182b3b2580f533d139428ac..91d2310667e44145cef59a091d810d386d561678 100644 (file)
--- a/include/sieve/class_sieveElement_Vacation.inc
+++ b/include/sieve/class_sieveElement_Vacation.inc
@@ -57,7 +57,7 @@ class sieve_vacation
             }
           }
         }else{
-              $this->addresses[] = $data['ELEMENTS'][$i]['text'] ;
+              $this->addresses[] =  preg_replace("/\"/i","",$data['ELEMENTS'][$i]['text']);
         }
       }
 

diff --git a/include/sieve/class_sieveManagement.inc b/include/sieve/class_sieveManagement.inc
index cde2d8540861c61a2322b8722dca02fda503adda..0c58e79c527d652095a70a1c9eac478273d94e1c 100644 (file)
--- a/include/sieve/class_sieveManagement.inc
+++ b/include/sieve/class_sieveManagement.inc
@@ -378,7 +378,9 @@ class sieveManagement extends plugin
     }
 
     /* Save currently edited sieve script. */
-    if($this->parent->acl_is_writeable("sieveManagement") && isset($_POST['save_sieve_changes'])){
+    if($this->parent->acl_is_writeable("sieveManagement") && 
+       isset($_POST['save_sieve_changes']) && 
+       is_object($this->current_handler)){
       $chk = $this->current_handler->check();
       if(!count($chk)){