From ac1b29eb5c0008f2282f197fa9e6df534a658d1d Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Thu, 23 May 2013 02:13:24 -0700
Subject: [PATCH] Generalize bare rendering into Reddit page class.

This fixes some controllers (spam listings) not handling bare requests.
---
 r2/r2/controllers/listingcontroller.py | 4 ----
 r2/r2/lib/pages/pages.py               | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py
index 7ac5e3118..1a1716abd 100755
--- a/r2/r2/controllers/listingcontroller.py
+++ b/r2/r2/controllers/listingcontroller.py
@@ -89,7 +89,6 @@ class ListingController(RedditController, OAuth2ResourceController):
     def pre(self):
         self.check_for_bearer_token()
         RedditController.pre(self)
-        self.bare = request.get.pop('bare', False)
 
     @property
     def menus(self):
@@ -110,9 +109,6 @@ class ListingController(RedditController, OAuth2ResourceController):
         self.builder_obj = self.builder()
         self.listing_obj = self.listing()
 
-        if self.bare:
-            return responsive(self.listing_obj.render())
-
         content = self.content()
         page_classes = self.extra_page_classes
         if (self.show_chooser and
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index bc5e390ab..e1ad210a9 100755
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -493,7 +493,11 @@ class Reddit(Templated):
         In adition, unlike Templated.render, the result is in the form of a pylons
         Response object with it's content set.
         """
-        res = Templated.render(self, *a, **kw)
+        if request.get.pop('bare', False):
+            res = self._content.render()
+        else:
+            res = Templated.render(self, *a, **kw)
+
         return responsive(res, self.space_compress)
 
     def corner_buttons(self):