Merge pull request #415 from 23n/patch-2

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index 66b684dc964b69cb5a140d8dc176e0172feb59a7..d2b57d4472fcbf2dd8035bfcc5a2941903288579 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -6,13 +6,19 @@ function filerm_content(&$a) {
                killme();
        }
 
-       $term = notags(trim($_GET['term']));
-       $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+       $term = unxmlify(trim($_GET['term']));
+       $cat = unxmlify(trim($_GET['cat']));
+
+       $category = (($cat) ? true : false);
+       if($category)
+               $term = $cat;
+
+       $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        logger('filerm: tag ' . $term . ' item ' . $item_id);
 
        if($item_id && strlen($term))
-               file_tag_unsave_file(local_user(),$item_id,$term);
+               file_tag_unsave_file(local_user(),$item_id,$term, $category);
 
        if(x($_SESSION,'return_url'))
                goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);