github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-03 11:15:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

UrlParser: support subdomains in get_subreddit

Browse Source
This commit is contained in:
Chad Birch
2013-06-21 15:16:14 -06:00
parent 983be398d2
commit 182953e007
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/lib/utils/utils.py
View File

@@ -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/')):