From 0162e4c031a3a9ea910d424e587867a5abdff064 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Wed, 10 Oct 2012 09:43:55 -0400
Subject: [PATCH] Remove more askbot remnants

---
 lms/djangoapps/courseware/tabs.py | 3 ---
 lms/envs/aws.py                   | 1 -
 lms/envs/common.py                | 1 -
 lms/envs/dev_ike.py               | 1 -
 lms/urls.py                       | 8 --------
 5 files changed, 14 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index e97622a5ef..5abdc93604 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -220,9 +220,6 @@ def get_default_tabs(user, course, active_page):
         link = reverse('django_comment_client.forum.views.forum_form_discussion',
                               args=[course.id])
         tabs.append(CourseTab('Discussion', link, active_page == 'discussion'))
-    elif settings.MITX_FEATURES.get('ENABLE_DISCUSSION'):
-        ## This is Askbot, which we should be retiring soon...
-        tabs.append(CourseTab('Discussion', reverse('questions'), active_page == 'discussion'))
 
     tabs.extend(_wiki({'name': 'Wiki', 'type': 'wiki'}, user, course, active_page))
 
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 9258c05538..cc33bf07c4 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -20,7 +20,6 @@ SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
 DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 
 # Disable askbot, enable Berkeley forums
-MITX_FEATURES['ENABLE_DISCUSSION'] = False
 MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
 
 # IMPORTANT: With this enabled, the server must always be behind a proxy that 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 5e1fa47c24..5376590e1f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -63,7 +63,6 @@ MITX_FEATURES = {
                                         # set to None to do no university selection
 
     'ENABLE_TEXTBOOK' : True,
-    'ENABLE_DISCUSSION' : False,
     'ENABLE_DISCUSSION_SERVICE': True,
 
     'ENABLE_PSYCHOMETRICS': False,	# real-time psychometrics (eg item response theory analysis in instructor dashboard)
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 0be9146fd4..9a456daecd 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -14,7 +14,6 @@ import socket
 
 WIKI_ENABLED = False
 MITX_FEATURES['ENABLE_TEXTBOOK'] = False
-MITX_FEATURES['ENABLE_DISCUSSION'] = False
 MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = True	  # require that user be in the staff_* group to be able to enroll
 MITX_FEATURES['SUBDOMAIN_COURSE_LISTINGS'] = False
 MITX_FEATURES['SUBDOMAIN_BRANDING'] = False
diff --git a/lms/urls.py b/lms/urls.py
index 662e41235e..a5c06ad979 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -219,14 +219,6 @@ if settings.QUICKEDIT:
     urlpatterns += (url(r'^quickedit/(?P<id>[^/]*)$', 'dogfood.views.quickedit'),)
     urlpatterns += (url(r'^dogfood/(?P<id>[^/]*)$', 'dogfood.views.df_capa_problem'),)
 
-if settings.ASKBOT_ENABLED:
-    urlpatterns += (url(r'^%s' % settings.ASKBOT_URL, include('askbot.urls')), \
-                    url(r'^settings/', include('askbot.deps.livesettings.urls')), \
-                    url(r'^followit/', include('followit.urls')), \
-#                       url(r'^robots.txt$', include('robots.urls')),
-                              )
-
-
 
 if settings.DEBUG:
     ## Jasmine and admin