removed url parameters and hash fragment from url to uploaded files

2 files changed, 12 insertions, 0 deletions

diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index e2056b61..19ecfb2d 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -10,6 +10,8 @@ Development version (not released yet)
 * Fixed the url translation bug (Evgeny)
 * Added left sidebar option (Evgeny)
 * Added "help" page and links to in the header and the footer (Evgeny)
+* Removed url parameters and the hash fragment from uploaded files -
+  amazon S3 for some reason adds weird expiration parameters
 
 0.7.39 (Jan 11, 2012)
 ---------------------
diff --git a/askbot/views/writers.py b/askbot/views/writers.py
index 9de14517..855f2977 100644
--- a/askbot/views/writers.py
+++ b/askbot/views/writers.py
@@ -12,6 +12,7 @@ import random
 import sys
 import tempfile
 import time
+import urlparse
 from django.core.files.storage import get_storage_class
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required
@@ -99,6 +100,15 @@ def upload(request):#ajax upload file to a question or answer
     if error == '':
         result = 'Good'
         file_url = file_storage.url(new_file_name)
+        parsed_url = urlparse.urlparse(file_url)
+        file_url = urlparse.urlunparse(
+            urlparse.ParseResult(
+                parsed_url.scheme, 
+                parsed_url.netloc,
+                parsed_url.path,
+                '', '', ''
+            )
+        )
     else:
         result = ''
         file_url = ''