[Vtigercrm-commits] [vtiger-commits] r7228 - in /vtigercrm/trunk: include/utils/DeleteUtils.php modules/Users/massdelete.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: don
Date: Sat Jun 17 06:44:56 2006
New Revision: 7228

Log:
deleting tag while deleting the entity

Modified:
    vtigercrm/trunk/include/utils/DeleteUtils.php
    vtigercrm/trunk/modules/Users/massdelete.php

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Sat Jun 17 06:44:56 2006
@@ -289,13 +289,13 @@
 			$adb->query($del_query);
 	break;
 	endswitch;
-	global $current_user;
-	require_once('include/freetag/freetag.class.php');
-	$freetag=new freetag();
-	$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 	
 	if($return_module == $module && $return_module !='Rss' && $return_module !='Portal')
 	{	
+		global $current_user;
+		require_once('include/freetag/freetag.class.php');
+		$freetag=new freetag();
+		$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 		$focus->mark_deleted($record);
 	}
 	if($module != 'Faq')

Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Sat Jun 17 06:44:56 2006
@@ -27,6 +27,10 @@
 {
         if(isPermitted($returnmodule,'Delete',$id) == 'yes')
         {
+		global $current_user;
+                require_once('include/freetag/freetag.class.php');
+                $freetag=new freetag();
+                $freetag->delete_all_object_tags_for_user($current_user->id,$id);
                 $sql="update vtiger_crmentity set deleted=1 where crmid='" .$id ."'";
                 $result = $adb->query($sql);
         }