Merge branch 'master' into social

* master:
  Fixing bug around missing feed links being checked for broken pages.
This commit is contained in:
Samuel Clay 2012-05-08 10:20:03 -07:00
commit c729ec6550

View file

@ -125,10 +125,11 @@ class Feed(models.Model):
feed['exception_type'] = None
feed['exception_code'] = self.exception_code
for broken_page in BROKEN_PAGE_URLS:
if broken_page in self.feed_link:
feed['disabled_page'] = True
break
if self.feed_link:
for broken_page in BROKEN_PAGE_URLS:
if broken_page in self.feed_link:
feed['disabled_page'] = True
break
if full:
feed['feed_tags'] = json.decode(self.data.popular_tags) if self.data.popular_tags else []