aboutsummaryrefslogtreecommitdiffstats
path: root/mod/filerm.php
diff options
context:
space:
mode:
authorVasudev Kamath <kamathvasudev@gmail.com>2012-05-05 20:48:16 +0530
committerVasudev Kamath <kamathvasudev@gmail.com>2012-05-05 20:48:16 +0530
commitb5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (patch)
tree74234775d723e33378059f2fa45fa80e3bc6ac43 /mod/filerm.php
parent214ec91a3f2c5fec6cced93f669b3a9725f0e40a (diff)
parent8ae83201cf8f3c943972a8f246b7972aa640afb4 (diff)
downloadvolse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.gz
volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.bz2
volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.zip
Merge branch 'master' of git://github.com/friendica/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']);