public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into circular

Browse source 
* master:
  Preventing infinite loop on merged dupe feeds.
This commit is contained in:
Samuel Clay 2013-05-07 16:23:34 -07:00
commit 4ae44c02bc
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/rss_feeds/models.py
View file

@ -1937,7 +1937,6 @@ def merge_feeds(original_feed_id, duplicate_feed_id, force=False):
" [B: %s]" % duplicate_feed.branch_from_feed.pk if duplicate_feed.branch_from_feed else ""))
original_feed.branch_from_feed = None
original_feed.save()
user_subs = UserSubscription.objects.filter(feed=duplicate_feed).order_by('-pk')
for user_sub in user_subs: