From 07dbc4e6f6e515be9405c8851764457a22263d8e Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 20 Jan 2017 09:49:19 -0500 Subject: [PATCH] Fix issue #161 where deleted page using default file/image fallback could delete fallback file if deleting page without outputFormatting enabled. --- wire/modules/Fieldtype/FieldtypeFile.module | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wire/modules/Fieldtype/FieldtypeFile.module b/wire/modules/Fieldtype/FieldtypeFile.module index 6de4fd65..a43afce6 100644 --- a/wire/modules/Fieldtype/FieldtypeFile.module +++ b/wire/modules/Fieldtype/FieldtypeFile.module @@ -517,7 +517,12 @@ class FieldtypeFile extends FieldtypeMulti { if($pagefiles = $page->get($field->name)) { - if($pagefiles instanceof Pagefiles) { + $dvpID = $field->get('defaultValuePage'); + + if($dvpID && $dvpID != $page->id && $pagefiles->page->id != $page->id) { + // pagefiles is a default/fallback value from another page and should not be deleted + + } else if($pagefiles instanceof Pagefiles) { $pagefiles->deleteAll(); } else if($pagefiles instanceof Pagefile) {