From 57aaf893c5a16710dc788bf360ba888d0aa2bb1e Mon Sep 17 00:00:00 2001 From: Steve Huffman Date: Fri, 22 Aug 2008 15:22:58 -0700 Subject: [PATCH] fix MaskedSR bug --- r2/r2/lib/db/queries.py | 2 +- r2/r2/models/subreddit.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/r2/r2/lib/db/queries.py b/r2/r2/lib/db/queries.py index 54164ed25..97c2ca8fe 100644 --- a/r2/r2/lib/db/queries.py +++ b/r2/r2/lib/db/queries.py @@ -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 diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index b15ffc893..9c59418cc 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -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):