From 41d778fe47c20f2d4c37b4c3089d50fbac6535a3 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 18 Apr 2014 10:58:56 +0200 Subject: address puppet 3.x deprecation warnings --- templates/vhosts/partials/php_settings.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/vhosts/partials/php_settings.erb') 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) -%> -- cgit v1.2.3