Download as
Browse Code »

Commit 5d5380a79a2e21e05619d03f4bbb6cca4ac957f3

Authored by Leandro Santos
1 parent d7093949
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

return empty array when nil profile is passed as parameter

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @5d5380a
... ... @@ -487,8 +487,8 @@ class Article < ActiveRecord::Base
487 487 scope :more_recent, :order => "created_at DESC"
488 488  
489 489 scope :display_filter, lambda {|user, profile|
490   - return published if (user.nil? && profile.public?)
491   - return [] if user.nil? || (!profile.public? && !user.follows?(profile))
  490 + return published if (user.nil? && profile && profile.public?)
  491 + return [] if user.nil? || profile.nil? || (!profile.public? && !user.follows?(profile))
492 492 where(
493 493 [
494 494 "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ?
... ...