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

toolbar: Use wrap_links correctly.

Browse Source
This commit is contained in:
Brian Simpson
2014-01-13 08:49:22 -05:00
parent 1090350a8d
commit 394eff4059
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
r2/r2/controllers/toolbar.py
View File

@@ -234,15 +234,19 @@ class ToolbarController(RedditController):
url = demangle_url(url)
if link:
listing = wrap_links(link, wrapper=FrameToolbar, skip=True, num=1)
wrapped = wrap_links(link, wrapper=FrameToolbar, num=1)
elif url:
listing = hot_links_by_url_listing(url, sr=c.site, num=1, skip=True)
if listing.things:
wrapped = listing.things[0]
else:
wrapped = None
else:
return self.abort404()
res = None
if listing.things:
res = listing.things[0]
if wrapped:
res = wrapped
elif url:
res = FrameToolbar(link=None, title=None, url=url, expanded=False)