diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 17:03:23 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 17:03:23 -0400 |
| commit | 5830c32dceb2429656ee4957690dd78c24641f02 (patch) | |
| tree | f71428787e701421068ce53e446bed47b7078fcf /mod/filerm.php | |
| parent | 00190b7faab2baf21523a7243268057142f6de88 (diff) | |
| parent | 37d4181fde392b5d31d77531255b345d9a0e718b (diff) | |
| download | volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.tar.gz volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.tar.bz2 volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
category removal
Esperanto 100%
"show more" friends in common
* 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']); |