summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-08-19 14:39:57 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-08-19 14:39:57 -0400
commit0f581ab94fcaf3e1f08cd774a8c8a570939d375f (patch)
tree09cb7016c85c8a704123d4705b8e19690f1db5da
parent37c13fae8cad1f0ce866c784b1ebe92fa7d625ad (diff)
downloadaskbot-0f581ab94fcaf3e1f08cd774a8c8a570939d375f.tar.gz
askbot-0f581ab94fcaf3e1f08cd774a8c8a570939d375f.tar.bz2
askbot-0f581ab94fcaf3e1f08cd774a8c8a570939d375f.zip
hopefully media urls work on windows. Thanks to adilkhash for the feedback
-rw-r--r--askbot/skins/utils.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py
index a492c87a..c07f2638 100644
--- a/askbot/skins/utils.py
+++ b/askbot/skins/utils.py
@@ -53,7 +53,13 @@ def get_media_url(url):
file_path
)
if os.path.isfile(file_path):
- url_copy = os.path.normpath('///' + url_copy)
+ url_copy = os.path.normpath(
+ '///' + url_copy
+ ).replace(
+ '\\', '/'
+ ).replace(
+ '///', '/'
+ )
return url_copy
else:
logging.critical('missing media resource %s' % url)
@@ -94,7 +100,11 @@ def get_media_url(url):
url = use_skin + '/media/' + url
url = '///' + django_settings.ASKBOT_URL + 'm/' + url
- url = os.path.normpath(url)
+ url = os.path.normpath(url).replace(
+ '\\', '/'
+ ).replace(
+ '///', '/'
+ )
if resource_revision:
url += '?v=%d' % resource_revision