Fix deleting last element from saved folder + Fix displaying empty saved folder

diff --git a/mod/filerm.php b/mod/filerm.php
index 335b27b32052b949fd3af790c898076c3b3211b2..d8da0e125511fdcc240b9547acdbcc7c72dcd056 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -14,7 +14,7 @@ function filerm_content(App $a)
        }
 
        $term = XML::unescape(trim($_GET['term']));
-       $cat = XML::unescape(trim($_GET['cat']));
+       $cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
 
        $category = (($cat) ? true : false);
 
@@ -25,12 +25,18 @@ function filerm_content(App $a)
 
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-       Logger::log('filerm: tag ' . $term . ' item ' . $item_id);
+       Logger::log('filerm: tag ' . $term . ' item ' . $item_id  . ' category ' . ($category ? 'true' :  'false'));
 
        if ($item_id && strlen($term))
        {
-               FileTag::unsaveFile(local_user(), $item_id, $term, $category);
+               if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)){
+                       info('Item removed');
+               }
+       }
+       else {
+               info('Item was not deleted');
        }
 
+       $a->internalRedirect('/network?f=&file=' . $term);
        killme();
 }

diff --git a/mod/network.php b/mod/network.php
index 81a2f2b2ba63e8514b634664d50191099d10e03b..37c7b452861f0c96f505bdefb2ddabc1dd5ac3bc 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -346,6 +346,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
        // Set this so that the conversation function can find out contact info for our wall-wall items
        $a->page_contact = $a->contact;
 
+       $items = (empty($items) ? [] : $items);
        $o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
 
        if (!$update) {

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index d3baffdd4fd02106e2ba307009ed068911be1d71..b5c4cf2aef695e1c177e76e75ebb55e0cd4c061c 100644 (file)
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -290,7 +290,7 @@ class FileTag
             return false;
         }
 
-        $fields = ['file' => str_replace($pattern, '', $item['file'])];
+        $fields = ['file' => str_replace($pattern, null, $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",

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 4a29e51d31a2fe3cce3728b65c3a5fffea91fbbc..8e154b0834fce888863a5145ed6085b69ac771c3 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -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']]);