diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-12-30 10:36:42 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-12-30 10:36:42 -0300 |
| commit | e86ef74587ad1efc94c8ca59b813ff260c590765 (patch) | |
| tree | 74a29c7e51f1baa8a860fa3fe3147dcf43ba4b4d | |
| parent | ab5b2d093e9a3cfb0aa5994f14743e93eae78f20 (diff) | |
| parent | 7c133a06ab6772980c3bb0be6f2078121c277d86 (diff) | |
| download | askbot-e86ef74587ad1efc94c8ca59b813ff260c590765.tar.gz askbot-e86ef74587ad1efc94c8ca59b813ff260c590765.tar.bz2 askbot-e86ef74587ad1efc94c8ca59b813ff260c590765.zip | |
Merge branch 'piskvorky'
| -rw-r--r-- | askbot/urls.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/askbot/urls.py b/askbot/urls.py index 2c3d143d..4bfab225 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -41,15 +41,10 @@ urlpatterns = patterns('', views.meta.media, name='askbot_media', ), - url( + url( # TODO: replace with django.conf.urls.static ? r'^%s(?P<path>.*)$' % settings.ASKBOT_UPLOADED_FILES_URL, 'django.views.static.serve', - {'document_root': os.path.join( - settings.PROJECT_ROOT, - 'askbot', - 'upfiles' - ).replace('\\','/') - }, + {'document_root': settings.ASKBOT_FILE_UPLOAD_DIR.replace('\\','/')}, name='uploaded_file', ), #no translation for this url!! |