1 files changed, 6 insertions, 8 deletions
diff --git a/settings.py b/settings.py
index 6b878ee..e99d199 100644
--- a/settings.py
+++ b/settings.py
@@ -1,3 +1,4 @@
+from localsettings import *
 import os
 import urlparse
 # Django settings for troggle project.
@@ -35,11 +36,10 @@ USE_I18N = True
 ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
 PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos')
 
-if URL_ROOT:    
-    MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
-    SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/')
-    PHOTOS_URL  = urlparse.urljoin(URL_ROOT , '/photos/')
-    SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/')
+MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
+SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/')
+PHOTOS_URL  = urlparse.urljoin(URL_ROOT , '/photos/')
+SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/')
 
 APPEND_SLASH = False
 SMART_APPEND_SLASH = True
@@ -86,6 +86,4 @@ INSTALLED_APPS = (
     'troggle.profiles',
     'troggle.expo',
     'troggle.imagekit', 
-)
-
-from localsettings import *
-\ No newline at end of file
+)
+\ No newline at end of file