Merge branch 'master' into dejal

* master:
  Drop tags with CDATA.
  css modification test
This commit is contained in:
Samuel Clay 2019-11-14 15:39:41 -05:00
commit b84cf5a6d7
2 changed files with 2 additions and 2 deletions

View file

@ -1938,7 +1938,7 @@ class Feed(models.Model):
term = tcat.label
elif hasattr(tcat, 'term') and tcat.term:
term = tcat.term
if not term:
if not term or "CDATA" in term:
continue
qcat = term.strip()
if ',' in qcat or '/' in qcat:

View file

@ -37,7 +37,7 @@ img {
max-width: 99% !important;
height: auto !important;
max-height: none !important;
margin: 1px !important;
margin: 4px !important;
}
p {