From 8e188e2b3c507150c0360caeaf568ea400f3f580 Mon Sep 17 00:00:00 2001
From: Andre D <andre@andred.ca>
Date: Thu, 13 Sep 2012 00:00:43 -0500
Subject: [PATCH] wiki: Rename wiki_disabled to disable_wiki.

---
 r2/example.ini            | 6 +++---
 r2/r2/controllers/wiki.py | 2 +-
 r2/r2/lib/app_globals.py  | 2 +-
 r2/r2/lib/pages/pages.py  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/r2/example.ini b/r2/example.ini
index e7701fbc9..a520edadd 100644
--- a/r2/example.ini
+++ b/r2/example.ini
@@ -81,6 +81,9 @@ disable_captcha = false
 disable_ratelimit = false
 disable_require_admin_otp = false
 
+# Disable wiki editing and viewing for everyone except admins
+disable_wiki = false
+
 # -- important settings -- 
 # the domain that this app serves itself up as
 domain = reddit.local
@@ -514,9 +517,6 @@ wiki_max_page_name_length = 128
 # Max number of separators in a wiki page name
 wiki_max_page_separators = 3
 
-# Disable wiki editing and viewing for everyone except admins
-wiki_disabled = false
-
 # Location (directory) for temp files for diff3 merging
 # Empty will use python default for temp files
 #   Pro tip: Use /dev/shm for in-memory diff3
diff --git a/r2/r2/controllers/wiki.py b/r2/r2/controllers/wiki.py
index f11e8ec78..4d54c4a5d 100644
--- a/r2/r2/controllers/wiki.py
+++ b/r2/r2/controllers/wiki.py
@@ -207,7 +207,7 @@ class WikiController(RedditController):
     
     def pre(self):
         RedditController.pre(self)
-        if g.wiki_disabled and not c.user_is_admin:
+        if g.disable_wiki and not c.user_is_admin:
             self.handle_error(403, 'WIKI_DOWN')
         if not c.site._should_wiki:
             self.handle_error(404, 'NOT_WIKIABLE') # /r/mod for an example
diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py
index aabef8c28..a53629629 100755
--- a/r2/r2/lib/app_globals.py
+++ b/r2/r2/lib/app_globals.py
@@ -151,7 +151,7 @@ class Globals(object):
             'disable_ratelimit',
             'amqp_logging',
             'read_only_mode',
-            'wiki_disabled',
+            'disable_wiki',
             'heavy_load_mode',
             's3_media_direct',
             'disable_captcha',
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index ed6cac384..73e49ee95 100755
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -445,7 +445,7 @@ class Reddit(Templated):
             if c.user_is_loggedin:
                 mod = bool(c.user_is_admin or c.site.is_moderator(c.user))
             if c.site._should_wiki and (c.site.wikimode != 'disabled' or mod):
-                if not g.wiki_disabled:
+                if not g.disable_wiki:
                     main_buttons.append(NavButton('wiki', 'wiki'))
 
         more_buttons = []