Switch to unified view
| a/Allura/allura/model/attachments.py | b/Allura/allura/model/attachments.py | ||
|---|---|---|---|
... |
... |
||
| 54 | thumbnail_meta=thumbnail_meta, |
54 | thumbnail_meta=thumbnail_meta, |
| 55 | save_original=True, |
55 | save_original=True, |
| 56 | original_meta=original_meta) |
56 | original_meta=original_meta) |
| 57 | if orig is not None: |
57 | if orig is not None: |
| 58 | return orig, thumbnail |
58 | return orig, thumbnail |
| 59 | 59 | else: |
|
| 60 | # No, generic attachment |
60 | # No, generic attachment
|
| 61 | fp.seek(0) # stream may have been partially consumed in a failed save_image attempt |
||
| 61 | return cls.from_stream( |
62 | return cls.from_stream(
|
| 62 | filename, fp, content_type=content_type, |
63 | filename, fp, content_type=content_type,
|
| 63 | **original_meta) |
64 | **original_meta)
|