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

fix MaskedSR bug

Browse Source
This commit is contained in:
Steve Huffman
2008-08-22 15:22:58 -07:00
parent 1861a04e45
commit 57aaf893c5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
r2/r2/lib/db/queries.py
View File

@@ -92,7 +92,7 @@ def merge_results(*results):
"""Given two CachedResults, mergers their lists based on the sorts of
their queries."""
if len(results) == 1:
return results[0]
return list(results[0])
#make sure the sorts match
sort = results[0].query._sort

10
r2/r2/models/subreddit.py
View File

@@ -405,7 +405,6 @@ class DefaultSR(FakeSubreddit):
results = []
for sr in srs:
results.append(queries.get_links(sr, sort, time))
return queries.merge_results(*results)
else:
q = Link._query(sort = queries.db_sort(sort))
@@ -448,10 +447,11 @@ class MaskedSR(DefaultSR):
def get_links(self, sort, time):
user = c.user if c.user_is_loggedin else None
subreddits = Subreddit.user_subreddits(user)
subreddits = [s for s in subreddits if s not in self.hide_sr]
subreddits.extend(self.show_sr)
return self.get_links_srs(subreddits, sort, time)
sr_ids = Subreddit.user_subreddits(user)
sr_ids = [s for s in sr_ids if s not in self.hide_sr]
sr_ids.extend(self.show_sr)
srs = Subreddit._byID(sr_ids, return_dict = False)
return self.get_links_srs(srs, sort, time)
class SubSR(FakeSubreddit):