summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-11-18 08:41:56 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-11-18 08:41:56 +0000
commitfcbd06e09069160a31bb70d3514383fea1e2b7f0 (patch)
tree3d16add989711dc3632a4f05973d3ab15d72f3ae /app
parent4df50bc66b40593b60dd7543ec3339ef6f549d8d (diff)
downloadredmine-fcbd06e09069160a31bb70d3514383fea1e2b7f0.tar.gz
redmine-fcbd06e09069160a31bb70d3514383fea1e2b7f0.zip
Allow Journal to return empty Array instead nil in Journal#attachments (#24308).
Patch by Roman Shipiev. git-svn-id: http://svn.redmine.org/redmine/trunk@15957 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/journal.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/journal.rb b/app/models/journal.rb
index c43c4da9c..3c15d978d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -125,7 +125,7 @@ class Journal < ActiveRecord::Base
end
def attachments
- journalized.respond_to?(:attachments) ? journalized.attachments : nil
+ journalized.respond_to?(:attachments) ? journalized.attachments : []
end
# Returns a string of css classes