Defect #35421 » 35421-v2.patch
lib/redmine/configuration.rb | ||
---|---|---|
93 | 93 |
yaml = nil |
94 | 94 |
begin |
95 | 95 |
yaml = YAML::load(ERB.new(File.read(filename)).result) |
96 |
rescue ArgumentError |
|
96 |
rescue ArgumentError, Psych::SyntaxError
|
|
97 | 97 |
abort "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded." |
98 | 98 |
rescue SyntaxError => e |
99 | 99 |
abort "A syntax error occurred when parsing your Redmine configuration file located at #{filename} with ERB:\n#{e.message}" |