diff options
author | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
commit | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (patch) | |
tree | 07a1b31339ccd871bb4fbfe73e3f0d4911689795 /mod/filerm.php | |
parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
parent | 53157bb954acb7597347c6b4a87e64e7a2f6cc79 (diff) | |
download | volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.gz volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.bz2 volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/filerm.php')
-rw-r--r-- | mod/filerm.php | 8 |
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']); |