diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-10-13 10:03:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-10-13 10:03:13 +0000 |
| commit | 60d6e169781e8aa40aab42c5df1f806f646d8bd0 (patch) | |
| tree | aee1c5c93c76f88b2c3684c8b6caa1b23e50176b /app/controllers | |
| parent | b071a937b3e08c2d43fc14151c63fdb1f96b3741 (diff) | |
| download | redmine-60d6e169781e8aa40aab42c5df1f806f646d8bd0.tar.gz redmine-60d6e169781e8aa40aab42c5df1f806f646d8bd0.zip | |
Fixed that non array commit_update_keywords raises an error (#7590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12216 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/settings_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index fdd6bf4f0..a115a30f0 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -47,7 +47,7 @@ class SettingsController < ApplicationController @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank? @commit_update_keywords = Setting.commit_update_keywords.dup - @commit_update_keywords << {} if @commit_update_keywords.blank? + @commit_update_keywords = [{}] unless @commit_update_keywords.is_a?(Array) && @commit_update_keywords.any? Redmine::Themes.rescan end |