Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder

Fix deleting last element and displaying empty saved folder

src/Model/FileTag.php

@@ -291,6 +291,7 @@ class FileTag
         }
 
         $fields = ['file' => str_replace($pattern, '', $item['file'])];
+
         Item::update($fields, ['id' => $item_id]);
 
         $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",

src/Model/Item.php

@@ -832,7 +832,7 @@ class Item extends BaseObject
 			$files = $fields['file'];
 			$fields['file'] = null;
 		} else {
-			$files = '';
+			$files = null;
 		}
 
 		$delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
@@ -911,7 +911,7 @@ class Item extends BaseObject
 				}
 			}
 
-			if (!empty($files)) {
+			if (!is_null($files)) {
 				Term::insertFromFileFieldByItemId($item['id'], $files);
 				if (!empty($item['file'])) {
 					DBA::update('item', ['file' => ''], ['id' => $item['id']]);