Skip to content

Commit 61d1943

Browse files
authored
Merge pull request #2293 from smokris/fix-deprecated-regex-on-hash
Fix deprecation warning about performing a regex comparison on a hash
2 parents ce06491 + b3ef204 commit 61d1943

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

templates/vhost/_require.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%- _item = scope.lookupvar('_template_scope')[:item] -%>
22
<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
3-
<%- if _item['require'] && _item['require'] != '' && _item['require'] !~ /unmanaged/i -%>
3+
<%- if _item['require'] && !(_item['require'].is_a?(String) && (_item['require'] == '' || _item['require'] =~ /unmanaged/i)) -%>
44
<%- if _item['require'].is_a?(Hash) -%>
55
<%- case _item['require']['enforce'].downcase
66
when 'all','none','any' then -%>

0 commit comments

Comments
 (0)