Updated advanced->statements and advanced->options array merging.

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

diff --git a/plugins/admin/systems/class_dhcpService.inc b/plugins/admin/systems/class_dhcpService.inc
index b2ed5610c04f18d05e0d4e7b5aef9914df5ce79f..3e0954d1b552cef7d79e03aa0f7a210bb2d678b0 100644 (file)
--- a/plugins/admin/systems/class_dhcpService.inc
+++ b/plugins/admin/systems/class_dhcpService.inc
@@ -78,7 +78,12 @@ class dhcpService extends dhcpPlugin
 
     /* Merge arrays for advanced view */
     foreach (array("options", "statements") as $type){
-      $tmp= array_merge($this->$type, $this->network->$type);
+
+      $tmp = $this->$type;
+      foreach($this->network->$type as $name => $value){
+        $tmp[$name] = $value;
+      }        
+
       $this->advanced->$type= $tmp;
     }
 
@@ -161,5 +166,5 @@ class dhcpService extends dhcpPlugin
   }
   
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>