From 182953e0072a0135b61bae6060e478b70a2c2c76 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Fri, 21 Jun 2013 15:16:14 -0600 Subject: [PATCH] UrlParser: support subdomains in get_subreddit --- r2/r2/lib/utils/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py index f1638d637..e5fc16a62 100644 --- a/r2/r2/lib/utils/utils.py +++ b/r2/r2/lib/utils/utils.py @@ -542,7 +542,9 @@ class UrlParser(object): from pylons import g from r2.models import Subreddit, Sub, NotFound, DefaultSR try: - if not self.hostname or self.hostname.startswith(g.domain): + if (not self.hostname or + is_subdomain(self.hostname, g.domain) or + self.hostname.startswith(g.domain)): if self.path.startswith('/r/'): return Subreddit._by_name(self.path.split('/')[2]) elif self.path.startswith(('/subreddits/', '/reddits/')):