Merge remote-tracking branch 'origin/release'

Contains hotfix/2013-18-21
This commit is contained in:
Julian Arni
2013-08-27 11:05:13 -04:00

View File

@@ -166,7 +166,7 @@ def upload_asset(request, org, course, coursename):
sc_partial = partial(StaticContent, content_loc, filename, mime_type)
if chunked:
content = sc_partial(upload_file.chunks())
temp_filepath = upload_file.temporary_file_path()
tempfile_path = upload_file.temporary_file_path()
else:
content = sc_partial(upload_file.read())
tempfile_path = None