From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Oct 2013 10:03:13 +0000 (+0000)
Subject: Fixed that non array commit_update_keywords raises an error (#7590).
X-Git-Tag: 2.4.0~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=60d6e169781e8aa40aab42c5df1f806f646d8bd0;p=redmine.git

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
---

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