Merge branch 'master' into ios8

* master:
  Take out iframes from notification emails. Vimeo has no easy way to sub in a thumbnail.
This commit is contained in:
Samuel Clay 2017-03-24 17:15:23 -07:00
commit c06993920d

View file

@ -295,6 +295,8 @@ class MUserFeedNotification(mongo.Document):
img = Tag(soup, 'img', [('style', "display: block; 'background-image': \"url(https://%s/img/reader/youtube_play.png), url(http://img.youtube.com/vi/%s/0.jpg)\"" % (fqdn, youtube_id)), ('src', 'http://img.youtube.com/vi/%s/0.jpg' % youtube_id)])
a.insert(0, img)
iframe.replaceWith(a)
else:
iframe.extract()
return unicode(soup)