github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 00:07:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

handles permalinks on cnamed profile pages correctly

Browse Source
This commit is contained in:
KeyserSosa
2008-09-10 12:28:48 -07:00
parent 1c6190fb2b
commit 886ceb2a88
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

13
r2/r2/templates/link.html
View File

@@ -84,7 +84,16 @@
</%def>
<%def name="subreddit()" buffered="True">
<a id="subreddit_${thing._fullname}" href="${thing.subreddit.path}" class="hover">
<%
if c.cname:
path = "http://" + get_domain(cname = (c.site == thing.subreddit),
subreddit = (c.site != thing.subreddit))
else:
path = thing.subreddit.path
endif
%>
<a id="subreddit_${thing._fullname}" href="${path}" class="hover"
${'target="_top"' if c.cname else ''} >
${thing.subreddit.name}
</a>
<script type="text/javascript">
@@ -123,7 +132,7 @@
from r2.lib.utils import timeago
from r2.models import FakeSubreddit
if isinstance(c.site, FakeSubreddit):
if isinstance(c.site, FakeSubreddit) or c.site != thing.subreddit:
taglinetext = _("submitted %(when)s ago by %(author)s to %(reddit)s")
else:
taglinetext = _("submitted %(when)s ago by %(author)s")