Remove HTTPS security preference

Redirect /prefs/security/ to /prefs/ if there are no security preferences to show. No longer needed now that reddit.com is HTTPS only.
reddit-archive · Sep 1, 2015 · 2ffe6d6 · 2ffe6d6
1 parent f49fd1f
commit 2ffe6d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py
@@ -1627,6 +1627,8 @@ def GET_prefs(self, location='', verified=False):
         elif location == 'delete':
             content = PrefDelete()
         elif location == 'security':
+            if c.user.name not in g.admins:
+                return self.redirect('/prefs/')
             content = PrefSecurity()
         else:
             return self.abort404()

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
@@ -1122,8 +1122,7 @@ def build_toolbars(self):
             NamedButton('update'),
         ])
 
-        # Hide the security tab behind a feature flag while it's being tested
-        if feature.is_enabled('allow_force_https'):
+        if c.user.name in g.admins:
             buttons += [NamedButton('security')]
         #if CustomerID.get_id(user):
         #    buttons += [NamedButton('payment')]