From 288df22e313347df60491e4b172874915c3f3949 Mon Sep 17 00:00:00 2001
From: aaron <devnull@localhost>
Date: Sat, 14 Mar 2009 17:09:41 +0100
Subject: [PATCH] [svn r8277]

---
 troggle/urls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/troggle/urls.py b/troggle/urls.py
index 239adff25..c2ea1a2d2 100644
--- a/troggle/urls.py
+++ b/troggle/urls.py
@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
-from django.conf import settings
+import troggle.settings as settings
 
 from expo.views import *  # flat import
 from expo.views_caves import *
@@ -77,5 +77,5 @@ urlpatterns = patterns('',
         {'document_root': settings.SURVEYS, 'show_indexes':True}),
 
     (r'^photos/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': settings.PHOTOS, 'show_indexes':True}),
+        {'document_root': settings.PHOTO_ROOT, 'show_indexes':True}),
 )