summaryrefslogtreecommitdiff
path: root/manifests/vhost/php/drupal.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-10-08 22:41:12 +0200
committermh <mh@immerda.ch>2011-10-08 22:41:12 +0200
commitc610223e886a41f56b4fbd1f570968e55260e642 (patch)
tree84d4c95e8d9af989484252a75f5c2bf9209ad256 /manifests/vhost/php/drupal.pp
parentcb9ef422a5e2dd35f24d857adc66a4d9293407d5 (diff)
migrate over to new stdlib function
Diffstat (limited to 'manifests/vhost/php/drupal.pp')
-rw-r--r--manifests/vhost/php/drupal.pp4
1 files changed, 1 insertions, 3 deletions
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,