Bug fix: allow deleting links between tags when deleting a user.

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@339 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/admin.php b/admin.php
index 6061565a62d0ff4c43d1531737bc0c56bac452bc..b57b5683f1ded41d2750e08b70023f2ba9d44d04 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -56,7 +56,7 @@ if ( $action
                                $uId = $userinfo['uId'];\r
 
                                $tagcacheservice->deleteByUser($uId);
-                               $tag2tagservice->removeLinkedTags('','','',$uId);\r
+                               $tag2tagservice->removeLinkedTagsForUser($uId);\r
                                $userservice->deleteUser($uId);\r
                                $bookmark2tagservice->deleteTagsForUser($uId);
                                $commondescriptionservice->deleteDescriptionsForUser($uId);

diff --git a/services/tag2tagservice.php b/services/tag2tagservice.php
index b2ffbf08567df0a88513ddae6e7a4f0e31e70575..956fd49b24790083c059be3fa62e689d87b2240b 100644 (file)
--- a/services/tag2tagservice.php
+++ b/services/tag2tagservice.php
@@ -309,6 +309,23 @@ class Tag2TagService {
                $this->db->sql_freeresult($dbresult);
                return true;
        }
+       
+       function removeLinkedTagsForUser($uId) {
+               $query = 'DELETE FROM '. $this->getTableName();
+               $query.= ' WHERE uId = "'. $uId .'"';
+
+               if (!($dbresult =& $this->db->sql_query($query))) {
+                       message_die(GENERAL_ERROR, 'Could not remove tag relation', '', __LINE__, __FILE__, $query, $this->db);
+                       return false;
+               }
+
+
+               // Update stats and cache
+               $this->update('', '', '', $uId);
+               
+               $this->db->sql_freeresult($dbresult);
+               return true;
+       }       
 
        function renameTag($uId, $oldName, $newName) {
                $tagservice =& ServiceFactory::getServiceInstance('TagService');