diff options
| author | mh <mh@immerda.ch> | 2011-10-08 20:15:42 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-10-08 20:15:42 +0200 |
| commit | 93384c3f85111bb5b52548b1edd787cf36184e27 (patch) | |
| tree | 53606d870dcea3b985f573479618b5c23c4c7da0 /manifests/vhost/php/typo3.pp | |
| parent | 1fc1184a4ceff562b969b148677a055ff99dc5f5 (diff) | |
merge functions to new stdlibs, fix has_key hash problem
Diffstat (limited to 'manifests/vhost/php/typo3.pp')
| -rw-r--r-- | manifests/vhost/php/typo3.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp index b12b6c1..a5f931c 100644 --- a/manifests/vhost/php/typo3.pp +++ b/manifests/vhost/php/typo3.pp @@ -85,7 +85,7 @@ define apache::vhost::php::typo3( # turn allow_url_fopen on for the extension manager fetch allow_url_fopen => 'On' } - $real_php_settings = hash_merge($typo3_php_settings,$php_settings) + $real_php_settings = merge($typo3_php_settings,$php_settings) # create vhost configuration file ::apache::vhost::php::webapp{$name: |