From 10754ced3e51f796102005b9661b747c06fd4e0b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 4 May 2012 06:42:56 -0700
Subject: category removal

---
 include/text.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index af32b2476..4ae5d1333 100644
--- a/include/text.php
+++ b/include/text.php
@@ -930,7 +930,7 @@ function prepare_body($item,$attach = false) {
 		foreach($matches as $mtch) {
 			if(strlen($x))
 				$x .= ',';
-			$x .= xmlify(file_tag_decode($mtch[1]));
+			$x .= xmlify(file_tag_decode($mtch[1])) . ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
 		}
 		if(strlen($x))
 			$s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; 
@@ -1466,12 +1466,16 @@ function file_tag_save_file($uid,$item,$file) {
 	return true;
 }
 
-function file_tag_unsave_file($uid,$item,$file) {
+function file_tag_unsave_file($uid,$item,$file,$cat = false) {
 	$result = false;
 	if(! intval($uid))
 		return false;
 
-	$pattern = '[' . file_tag_encode($file) . ']' ;
+	if($cat == true)
+		$pattern = '<' . file_tag_encode($file) . '>' ;
+	else
+		$pattern = '[' . file_tag_encode($file) . ']' ;
+
 
 	$r = q("select file from item where id = %d and uid = %d limit 1",
 		intval($item),
@@ -1486,13 +1490,14 @@ function file_tag_unsave_file($uid,$item,$file) {
 		intval($uid)
 	);
 
-	$r = q("select file from item where uid = %d " . file_tag_file_query('item',$file),
+	$r = q("select file from item where uid = %d " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
 		intval($uid)
 	);
 
 	if(! count($r)) {
 		$saved = get_pconfig($uid,'system','filetags');
 		set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
+
 	}
 	return true;
 }
-- 
cgit v1.2.3