From c0b73d4777fad30b57de96b71656a61ad972eb9d Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Thu, 14 May 2009 06:32:58 +0100 Subject: [PATCH] [svn] --- settings.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/settings.py b/settings.py index 449faf4ba..4a6fa34b9 100644 --- a/settings.py +++ b/settings.py @@ -35,10 +35,12 @@ USE_I18N = True # Examples: "http://foo.com/media/", "/media/". ADMIN_MEDIA_PREFIX = '/troggle/media-admin/' PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos') -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/') + +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/') APPEND_SLASH = False SMART_APPEND_SLASH = True