Merge remote-tracking branch 'origin/dev'

This commit is contained in:
echel0n 2014-06-22 20:41:03 -07:00
commit 3a70a6effe

View file

@ -154,11 +154,11 @@ class MainHandler(RequestHandler):
def http_error_404_handler(self):
""" Custom handler for 404 error, redirect back to main page """
self.redirect('/home/')
return self.redirect('/home/')
def write_error(self, status_code, **kwargs):
if status_code == 404:
self.redirect('/home/')
return self.redirect('/home/')
elif status_code == 401:
self.finish(self.http_error_401_handler())
else:
@ -209,7 +209,7 @@ class MainHandler(RequestHandler):
def redirect(self, url, permanent=False, status=None):
self._transforms = []
super(MainHandler, self).redirect(sickbeard.WEB_ROOT + url, permanent, status)
return super(MainHandler, self).redirect(sickbeard.WEB_ROOT + url, permanent, status)
def get(self, *args, **kwargs):
response = self._dispatch()