From b6757903123fad87690aae0fd1f1daabd579e127 Mon Sep 17 00:00:00 2001 From: spez Date: Mon, 6 Oct 2008 13:59:57 -0700 Subject: [PATCH] fix bug where language subreddits were 404ing because their names were 2 characters long --- r2/r2/config/middleware.py | 2 +- r2/r2/controllers/reddit_base.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py index 2ab9f2b9d..516c6ff43 100644 --- a/r2/r2/config/middleware.py +++ b/r2/r2/config/middleware.py @@ -241,7 +241,7 @@ class DomainMiddleware(object): class SubredditMiddleware(object): - sr_pattern = re.compile(r'^/r/([^/]{3,})') + sr_pattern = re.compile(r'^/r/([^/]{2,})') def __init__(self, app): self.app = app diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index fa4b79f04..9631b0baf 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -239,7 +239,10 @@ def set_subreddit(): c.site = Subreddit._by_name(sr_name) except NotFound: c.site = Default - redirect_to("/reddits/create?name=%s" % sr_name) + if chksrname(sr_name): + redirect_to("/reddits/create?name=%s" % sr_name) + else: + abort(404, "not found") #if we didn't find a subreddit, check for a domain listing if not sr_name and c.site == Default and domain: