diff options
| author | mh <mh@immerda.ch> | 2014-04-18 10:58:56 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-18 10:58:56 +0200 |
| commit | 41d778fe47c20f2d4c37b4c3089d50fbac6535a3 (patch) | |
| tree | 7d88ed6ca5e7b1733204f624fef6d3ce92750a4c /templates/vhosts/partials/php_settings.erb | |
| parent | d4a70a927e41c181aa07d467a2478db74439aadb (diff) | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/vhosts/partials/php_settings.erb')
| -rw-r--r-- | templates/vhosts/partials/php_settings.erb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/vhosts/partials/php_settings.erb b/templates/vhosts/partials/php_settings.erb index fe55967..74f6ecf 100644 --- a/templates/vhosts/partials/php_settings.erb +++ b/templates/vhosts/partials/php_settings.erb @@ -1,6 +1,6 @@ -<% if run_mode != 'fcgid' - php_settings.reject{|k,v| v == :undef }.keys.sort.each do |key| - dvalue = php_settings[key].to_s.downcase +<% if @run_mode != 'fcgid' + @php_settings.reject{|k,v| (v == :undef) || v.nil? }.keys.sort.each do |key| + dvalue = @php_settings[key].to_s.downcase munged_value = if dvalue == 'true' 'on' elsif dvalue == 'false' @@ -8,7 +8,7 @@ elsif ['on','off'].include?(dvalue) dvalue else - php_settings[key] + @php_settings[key] end if ['on','off' ].include?(munged_value) -%> |