clean up MEDIA_URL: fixes #8, fixes #9

2 files changed, 2 insertions, 4 deletions

diff --git a/chishop/conf/default.py b/chishop/conf/default.py
index 606d9d1..97002b6 100644
--- a/chishop/conf/default.py
+++ b/chishop/conf/default.py
@@ -58,9 +58,7 @@ MEDIA_ROOT = os.path.join(here, 'media')
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'media/'
-
-MEDIA_PREFIX = "/media/"
+MEDIA_URL = '/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
diff --git a/chishop/urls.py b/chishop/urls.py
index ab2e8a9..5a5dd77 100644
--- a/chishop/urls.py
+++ b/chishop/urls.py
@@ -10,7 +10,7 @@ urlpatterns = patterns('')
 # Serve static pages.
 if settings.LOCAL_DEVELOPMENT:
     urlpatterns += patterns("django.views",
-        url(r"%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", {
+        url(r"^%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", {
             "document_root": settings.MEDIA_ROOT}))
 
 urlpatterns += patterns("",