From a4afe4c5156abd4bb4298610cb4ee6428a3e3f07 Mon Sep 17 00:00:00 2001 From: Marc Worrell Date: Tue, 25 Jan 2011 19:22:39 +0100 Subject: [PATCH] Allow #upload{} as a insert_file parameter. --- src/models/m_media.erl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/models/m_media.erl b/src/models/m_media.erl index 08ea2b513d..f9fb957796 100644 --- a/src/models/m_media.erl +++ b/src/models/m_media.erl @@ -204,6 +204,10 @@ replace(Id, Props, Context) -> insert_file(File, Context) -> insert_file(File, [], Context). +insert_file(#upload{filename=OriginalFilename, tmpfile=TmpFile}, Props, Context) -> + PropsMedia = add_medium_info(TmpFile, OriginalFilename, [{original_filename, OriginalFilename}], Context), + insert_file(TmpFile, [{original_filename, OriginalFilename}|Props], PropsMedia, Context); + insert_file(File, Props, Context) -> OriginalFilename = proplists:get_value(original_filename, Props, File), PropsMedia = add_medium_info(File, OriginalFilename, [{original_filename, OriginalFilename}], Context),