[Magellancms-cvs] magellan/var/lib magellan.library,1.11,1.12

[<ro...@us...>]

Update of /cvsroot/magellancms/magellan/var/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv4810/var/lib

Modified Files:
	magellan.library 
Log Message:
Fixed two wrong queries that prevent associations to be correctly
removed in MagellanRelationsHandler::RemoveAllRelations() (magellan.library).


Index: magellan.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/magellan.library,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** magellan.library	12 Mar 2003 14:03:00 -0000	1.11
--- magellan.library	31 Mar 2003 10:51:59 -0000	1.12
***************
*** 1674,1680 ****
  				case MAGELLAN_RELATION_CONTAINER:
  					$result = $this->mrSiteDb->Execute( "DELETE FROM links ".
! 						"WHERE ".
! 						"pageid=".$containerId." AND ".
! 						"srctype=".$containerType );
  					break;
  
--- 1674,1680 ----
  				case MAGELLAN_RELATION_CONTAINER:
  					$result = $this->mrSiteDb->Execute( "DELETE FROM links ".
!                                                 "WHERE ".
!                                                 "pageid=".$id." AND ".
!                                                 "srctype=".$type );
  					break;
  
***************
*** 1686,1692 ****
  					if ( $type_query->NumRows() > 0 )
  					{
!                         $this->mrSiteDb->Execute( 'DELETE FROM magellanacls '.
!                             'WHERE itemtype='.$this->mrSiteDb->Format_Text( $type_query->Fields( 'id' ) ).' '.
!                             'AND itemid='.$id );
  
  						$result = $this->mrSiteDb->Execute( "DELETE FROM links ".
--- 1686,1692 ----
  					if ( $type_query->NumRows() > 0 )
  					{
!                                                 $this->mrSiteDb->Execute( 'DELETE FROM magellanacls '.
!                                                 'WHERE itemtype='.$this->mrSiteDb->Format_Text( $type ).' '.
!                                                 'AND itemid='.$id );
  
  						$result = $this->mrSiteDb->Execute( "DELETE FROM links ".