mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
#1892 - Image attach from file store broken (merged from branches/2.2.0@45907, r45762)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46113 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
cdf221bdde
commit
8f712a3392
@ -625,7 +625,7 @@ class Image_Uploader extends Controller {
|
|||||||
* Save the data in this form.
|
* Save the data in this form.
|
||||||
*/
|
*/
|
||||||
function save($data, $form) {
|
function save($data, $form) {
|
||||||
if($data['Upload']['size'] == 0) {
|
if($data['ImageSource'] != 'existing' && $data['Upload']['size'] == 0) {
|
||||||
// No image has been uploaded
|
// No image has been uploaded
|
||||||
Director::redirectBack();
|
Director::redirectBack();
|
||||||
return;
|
return;
|
||||||
@ -746,4 +746,4 @@ class Image_Uploader extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user