diff --git a/files/helpers/const.py b/files/helpers/const.py index 685a902040..3d1e585222 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -76,7 +76,6 @@ SLURS = { "sheeny": "Israeli friend", "sheenies": "Israeli friends", "hymie": "Israeli friend", - "god": "Allah (SWT)", "allah": "Allah (SWT)", "mohammad": "Prophet Mohammad (PBUH)", "muhammad": "Prophet Mohammad (PBUH)", diff --git a/files/routes/front.py b/files/routes/front.py index 565b0c61d8..eeddbe1851 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -177,9 +177,9 @@ def front_all(v, sub=None, subdomain=None): try: lt=int(request.values.get("utc_less_than", 0)) except: lt=0 - if SITE_NAME == 'Drama': defaultsubs = 1 - else: defaultsubs = 2 - subs = v.subs if v else defaultsubs + if v: subs = v.subs + elif SITE_NAME == 'Drama': subs = 1 + else: subs = 2 ids, next_exists = frontlist(sort=sort, page=page, diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 4bcff8b58c..a29d7e7390 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -1,4 +1,4 @@ - +