Replaced array_merge with array operator +

[gosa.git] / plugins / admin / systems / class_dhcpService.inc

diff --git a/plugins/admin/systems/class_dhcpService.inc b/plugins/admin/systems/class_dhcpService.inc
index 3e0954d1b552cef7d79e03aa0f7a210bb2d678b0..c4a0a7e2cd391ce6296735cbe067b3500c1a8426 100644 (file)
--- a/plugins/admin/systems/class_dhcpService.inc
+++ b/plugins/admin/systems/class_dhcpService.inc
@@ -78,13 +78,7 @@ class dhcpService extends dhcpPlugin
 
     /* Merge arrays for advanced view */
     foreach (array("options", "statements") as $type){
-
-      $tmp = $this->$type;
-      foreach($this->network->$type as $name => $value){
-        $tmp[$name] = $value;
-      }        
-
-      $this->advanced->$type= $tmp;
+      $this->advanced->$type= $this->$type + $this->network->$type;;
     }
 
     $display.= $this->advanced->execute();