Commit cee44501 by Julian Arni

Merge remote-tracking branch 'origin/release'

   Contains hotfix/2013-18-21
parents 0e4b1142 e01ea885
...@@ -166,7 +166,7 @@ def upload_asset(request, org, course, coursename): ...@@ -166,7 +166,7 @@ def upload_asset(request, org, course, coursename):
sc_partial = partial(StaticContent, content_loc, filename, mime_type) sc_partial = partial(StaticContent, content_loc, filename, mime_type)
if chunked: if chunked:
content = sc_partial(upload_file.chunks()) content = sc_partial(upload_file.chunks())
temp_filepath = upload_file.temporary_file_path() tempfile_path = upload_file.temporary_file_path()
else: else:
content = sc_partial(upload_file.read()) content = sc_partial(upload_file.read())
tempfile_path = None tempfile_path = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment