[otrs-cvs] otrs/Kernel/System LinkObject.pm,1.58.4.1,1.58.4.2

Comments:
Update of /home/cvs/otrs/Kernel/System
In directory lancelot:/tmp/cvs-serv12656/Kernel/System

Modified Files:
      Tag: rel-3_1
	LinkObject.pm 
Log Message:
Fixed bug #9054 - Link Object deletes all links under certain conditions.

Author: ub

Index: LinkObject.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/LinkObject.pm,v
retrieving revision 1.58.4.1
retrieving revision 1.58.4.2
diff -2 -u -d -r1.58.4.1 -r1.58.4.2
--- LinkObject.pm	1 Jul 2012 23:09:45 -0000	1.58.4.1
+++ LinkObject.pm	21 Jan 2013 15:06:02 -0000	1.58.4.2
@@ -1,5 +1,5 @@
 # --
 # Kernel/System/LinkObject.pm - to link objects
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -505,5 +505,5 @@
         return 1 if !$TypeData{Pointed};
         return 1 if $Existing{SourceObjectID} eq $Param{SourceObjectID}
-                && $Existing{SourceKey} eq $Param{SourceKey};
+            && $Existing{SourceKey} eq $Param{SourceKey};
 
         # log error
@@ -746,8 +746,8 @@
         SQL => 'SELECT source_object_id, source_key, target_object_id, target_key, state_id '
             . 'FROM link_relation '
-            . 'WHERE ( source_object_id = ? AND source_key = ? '
+            . 'WHERE ((source_object_id = ? AND source_key = ? '
             . 'AND target_object_id = ? AND target_key = ? ) '
             . 'OR ( source_object_id = ? AND source_key = ? '
-            . 'AND target_object_id = ? AND target_key = ? ) '
+            . 'AND target_object_id = ? AND target_key = ? )) '
             . 'AND type_id = ? ',
         Bind => [
@@ -839,8 +839,8 @@
     return if !$Self->{DBObject}->Do(
         SQL => 'DELETE FROM link_relation '
-            . 'WHERE ( source_object_id = ? AND source_key = ? '
+            . 'WHERE (( source_object_id = ? AND source_key = ? '
             . 'AND target_object_id = ? AND target_key = ? ) '
             . 'OR ( source_object_id = ? AND source_key = ? '
-            . 'AND target_object_id = ? AND target_key = ? ) '
+            . 'AND target_object_id = ? AND target_key = ? )) '
             . 'AND type_id = ? ',
         Bind => [
@@ -1715,5 +1715,5 @@
         }
 
-        # check the state id
+        # check the type id
         if ( !$TypeID ) {
             $Self->{LogObject}->Log(
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log