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

Make permalink and URL fields consistent in JSON.

Browse Source
This commit is contained in:
Andre D
2011-07-19 13:20:06 +12:00
committed by Neil Williams
parent f969136090
commit b6361cd831
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
r2/r2/models/link.py
View File

@@ -274,9 +274,12 @@ class Link(Thing, Printable):
elif not c.cname and not force_domain:
res = "/r/%s/%s" % (sr.name, p)
elif sr != c.site or force_domain:
res = "http://%s/%s" % (get_domain(cname = (c.cname and
sr == c.site),
subreddit = not c.cname), p)
if(c.cname and sr == c.site):
res = "http://%s/%s" % (get_domain(cname = True,
subreddit = False),p)
else:
res = "http://%s/r/%s/%s" % (get_domain(cname = False,
subreddit = not c.cname),sr.name,p)
else:
res = "/%s" % p