Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index c520fec7ac0f48a5adcdf13630f76a1026bd611c..f34421ba528440a8358d9757cd1bb6ec050bf627 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,21 +1,27 @@
 <?php
 
-function filerm_content(&$a) {
+function filerm_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                killme();
        }
 
        $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']);
-       
+               goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+
        killme();
 }