From c610223e886a41f56b4fbd1f570968e55260e642 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Oct 2011 22:41:12 +0200
Subject: migrate over to new stdlib function

---
 manifests/vhost/php/drupal.pp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'manifests/vhost/php/drupal.pp')

diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp
index 9372b0d..d07beb7 100644
--- a/manifests/vhost/php/drupal.pp
+++ b/manifests/vhost/php/drupal.pp
@@ -99,8 +99,6 @@ define apache::vhost::php::drupal(
       'mbstring.encoding_translation' => 0,
     }
     
-    $drupal_php_settings = hash_merg($std_drupal_php_settings, $php_settings)
-
     # create vhost configuration file
     ::apache::vhost::php::webapp{$name:
         ensure => $ensure,
@@ -118,7 +116,7 @@ define apache::vhost::php::drupal(
         run_uid => $run_uid,
         run_gid => $run_gid,
         allow_override => $allow_override,
-        php_settings => $drupal_php_settings,
+        php_settings =>merge($std_drupal_php_settings, $php_settings),
         php_options => $php_options,
         do_includes => $do_includes,
         options => $options,
-- 
cgit v1.2.3