Download as
Browse Code »

Commit 39ad2a1203803cf1e9eb92ce4a5605fb71e36be1

Authored by Antonio Terceiro
1 parent 6738f312
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem1049: don't copy feeds from templates

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @39ad2a1
@@ -437,6 +437,7 @@ class Profile < ActiveRecord::Base @@ -437,6 +437,7 @@ class Profile < ActiveRecord::Base
437 end 437 end
438 438
439 def copy_article_tree(article, parent=nil) 439 def copy_article_tree(article, parent=nil)
  440 + return if article.is_a?(RssFeed)
440 original_article = self.articles.find_by_name(article.name) 441 original_article = self.articles.find_by_name(article.name)
441 if original_article 442 if original_article
442 num = 2 443 num = 2