From c89e290cdd5e2cd70a0506af7861b83c01729cda Mon Sep 17 00:00:00 2001
From: Rocky Duan <dementrock@gmail.com>
Date: Thu, 16 Aug 2012 13:43:48 -0700
Subject: [PATCH] use only one conf param

---
 lms/envs/common.py | 5 ++---
 lms/urls.py        | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index eaa05f4a70..305f2930d4 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -34,10 +34,9 @@ from .discussionsettings import *
 
 ################################### FEATURES ###################################
 COURSEWARE_ENABLED = True
-ASKBOT_ENABLED = True
+ASKBOT_ENABLED = False
 GENERATE_RANDOM_USER_CREDENTIALS = False
 PERFSTATS = False
-DISCUSSION_SERVICE_ENABLED = True
 
 # Features
 MITX_FEATURES = {
@@ -53,7 +52,7 @@ MITX_FEATURES = {
     'DARK_LAUNCH': False,  # When True, courses will be active for staff only
 
     'ENABLE_TEXTBOOK' : True,
-    'ENABLE_DISCUSSION' : True,
+    'ENABLE_DISCUSSION' : False,
     'ENABLE_DISCUSSION_SERVICE': True,
 
     'ENABLE_SQL_TRACKING_LOGS': False,
diff --git a/lms/urls.py b/lms/urls.py
index fe8bf0193b..b3e37906a0 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -156,7 +156,7 @@ if settings.COURSEWARE_ENABLED:
     )
 
     # discussion forums live within courseware, so courseware must be enabled first
-    if settings.DISCUSSION_SERVICE_ENABLED:
+    if settings.MITX_FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
 
         urlpatterns += (
             url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/news$',