From ff42b190b565e3b30cf693d7bbd0e90e3fd7dcca Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Mon, 17 Oct 2011 16:39:43 -0700
Subject: [PATCH] Remove default subreddit from submit form for special
 reddits.

---
 r2/r2/lib/pages/pages.py     | 4 ++--
 r2/r2/templates/newlink.html | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index a74c96f65..decec79cf 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -1755,8 +1755,8 @@ class NewLink(Templated):
 
         self.on_default_sr = c.default_sr
 
-        if isinstance(c.site, FakeSubreddit):
-            self.default_sr = subreddits[0] if subreddits else g.default_sr
+        if c.default_sr:
+            self.default_sr = None
         else:
             self.default_sr = c.site.name
 
diff --git a/r2/r2/templates/newlink.html b/r2/r2/templates/newlink.html
index fc94be5fe..54f7fa5e0 100644
--- a/r2/r2/templates/newlink.html
+++ b/r2/r2/templates/newlink.html
@@ -29,11 +29,7 @@
 <%namespace file="utils.html" import="error_field, submit_form, plain_link, text_with_links, reddit_selector"/>
 <%namespace name="utils" file="utils.html"/>
 
-%if c.on_default_sr:
-  <h1>${_("submit to reddit")}</h1>
-%else:
-  <h1>${_("submit to %(sr)s") % dict(sr=thing.default_sr)}</h1>
-%endif
+<h1>${_("submit to %(sr)s") % dict(sr=thing.default_sr if not thing.on_default_sr else _("reddit"))}</h1>
 
 <%utils:submit_form onsubmit="return post_form(this, 'submit', linkstatus, null, true)" 
                     action=${add_sr("/submit")},