Deleting feeds from folders if they are coming from the toplevel (i.e. no folder specified). This is to handle the cases where we no longer know the feed's folder, but we're deleting it anyhow. Only deletes the first case, anyway. Not ideal, but pretty close.

This commit is contained in:
Samuel Clay 2011-05-11 09:51:16 -04:00
parent 0139cf439f
commit d195b3803c

View file

@ -318,7 +318,7 @@ class UserSubscriptionFolders(models.Model):
(folder_name == in_folder and deleted))):
multiples_found = True
logging.user(self.user, "~FB~SBDeleting feed, and a multiple has been found in '%s'" % (folder_name))
if folder == feed_id and folder_name == in_folder and not deleted:
if folder == feed_id and (folder_name == in_folder or not folder_name) and not deleted:
logging.user(self.user, "~FBDelete feed: %s'th item: %s folders/feeds" % (
k, len(old_folders)
))