From 442c9714f3c87b628ead18ec5703a170498663b7 Mon Sep 17 00:00:00 2001 From: Christopher Slowe Date: Tue, 26 Aug 2008 10:17:00 -0700 Subject: [PATCH] fixed cname caching bug --- r2/r2/controllers/api.py | 5 ++++- r2/r2/lib/menus.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 28afe1d6c..bf84042ea 100644 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -908,10 +908,13 @@ class ApiController(RedditController): if not res.error: #assume sr existed, or was just built - clear_memo('subreddit._by_domain', Subreddit, _force_unicode(sr.domain)) + clear_memo('subreddit._by_domain', + Subreddit, _force_unicode(sr.domain)) for k, v in kw.iteritems(): setattr(sr, k, v) sr._commit() + clear_memo('subreddit._by_domain', + Subreddit, _force_unicode(sr.domain)) # flag search indexer that something has changed tc.changed(sr) diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py index f5386967b..4735b2983 100644 --- a/r2/r2/lib/menus.py +++ b/r2/r2/lib/menus.py @@ -347,6 +347,7 @@ class SimpleGetMenu(NavMenu): def __init__(self, **kw): kw['default'] = kw.get('default', self.default) + kw['base_path'] = kw.get('base_path') or request.path buttons = [NavButton(self.make_title(n), n, opt = self.get_param) for n in self.options] NavMenu.__init__(self, buttons, type = self.type, **kw)