Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2014-09-06 06:52:18 +0400
committerJonne Haß <me@jhass.eu>2014-09-06 06:52:18 +0400
commit01e012728722ea75faae9be9307d74fcce8ee770 (patch)
tree912409167549e7ff68a2438c7aa601766fe8d1b6 /app
parent476376dcb0b886fef92b4add3757993f5ce66a8c (diff)
Ignore embedded photos if invalid
For example if they're already present Also refactor StatusMessage XML specs
Diffstat (limited to 'app')
-rw-r--r--app/models/status_message.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index e817b8507..fa04daf4d 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -187,5 +187,10 @@ class StatusMessage < Post
def self.tag_stream(tag_ids)
joins(:taggings).where('taggings.tag_id IN (?)', tag_ids)
end
+
+ def after_parse
+ # Make sure already received photos don't invalidate the model
+ self.photos = photos.select(&:valid?)
+ end
end