Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index 335b27b32052b949fd3af790c898076c3b3211b2..d240c2d6a757927df98f1bf81134889c7e69da16 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,17 @@ 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 ($item_id && strlen($term)) {
+               if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
+                       info('Item removed');
+               }
+       }
+       else {
+               info('Item was not deleted');
        }
 
+       $a->internalRedirect('/network?f=&file=' . rawurlencode($term));
        killme();
 }