From 4405bef7a3dba6337fe4acdd1b70ea6f79c4eb8d Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 1 Jan 2012 15:22:54 -0500
Subject: [PATCH] Supports askbot dir

---
 settings.py | 4 +++-
 urls.py     | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/settings.py b/settings.py
index 764940c7f9..f28d5d32cf 100644
--- a/settings.py
+++ b/settings.py
@@ -143,6 +143,8 @@ TRACK_DIR = None
 execfile("../settings.py")
 
 if ASKBOT_ENABLED:
+   import sys
+   sys.path.append(ASKBOT_DIR)
    import os
    import askbot
    import site
@@ -200,7 +202,7 @@ if ASKBOT_ENABLED:
    CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
    ASKBOT_URL = 'discussion/'
    LOGIN_REDIRECT_URL = '/'
-   LOGIN_URL = '/#login'
+   LOGIN_URL = '/'
    
    ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/')
    ALLOW_UNICODE_SLUGS = False
diff --git a/urls.py b/urls.py
index 755c7aa789..7c714aa058 100644
--- a/urls.py
+++ b/urls.py
@@ -44,6 +44,7 @@ if settings.ASKBOT_ENABLED:
                                  url(r'^admin/', include(admin.site.urls)), \
                                  url(r'^settings/', include('askbot.deps.livesettings.urls')), \
                                  url(r'^followit/', include('followit.urls')), \
-                                 url(r'^robots.txt$', include('robots.urls')),)
+#                                 url(r'^robots.txt$', include('robots.urls')),
+                              )
 
 urlpatterns = patterns(*urlpatterns)