aboutsummaryrefslogtreecommitdiffstats
path: root/mod/filerm.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-19 16:55:33 +0200
committerMichael <icarus@dabo.de>2012-05-19 16:55:33 +0200
commit6342b3e0bdd5774857a8fca809994f05e0208d25 (patch)
tree54114a005e74c8a6d8bad8a490e1d1e41bc4178f /mod/filerm.php
parent2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff)
parent9a940786c18c1c2bd772aec93f1828f67dc45667 (diff)
downloadvolse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz
volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2
volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'mod/filerm.php')
-rw-r--r--mod/filerm.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/filerm.php b/mod/filerm.php
index c520fec7a..d2b57d447 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -7,12 +7,18 @@ function filerm_content(&$a) {
}
$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']);