From 18b1c86bb92ace11e9e36745114b1ac92c1b30cb Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Fri, 18 Apr 2008 09:00:43 +1200 Subject: [PATCH] Relationship deletion also needs reversing. --- inc/RSCDSUser.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php index 246734c5..8bd7d2ae 100644 --- a/inc/RSCDSUser.php +++ b/inc/RSCDSUser.php @@ -163,7 +163,7 @@ class RSCDSUser extends User $browser->AddHidden( 'confers' ); $browser->AddColumn( 'email', translate('EMail') ); if ( $ef->EditMode ) { // && $session->AllowedTo("MaintainRelationships") ) { - $browser->AddColumn( 'delete', translate('Delete'), 'centre', '', "'base_url/usr.php?edit=1&user_no=$this->user_no&action=delete_relationship&to_user=' || user_no || '\">Delete'" ); + $browser->AddColumn( 'delete', translate('Delete'), 'centre', '', "'base_url/usr.php?edit=1&user_no=$this->user_no&action=delete_relationship&from_user=' || user_no || '\">Delete'" ); } $browser->SetJoins( 'relationship NATURAL JOIN relationship_type rt LEFT JOIN usr ON (from_user = user_no)' ); @@ -282,10 +282,10 @@ EOSQL; switch( $action ) { case 'delete_relationship': - dbg_error_log("User",":HandleAction: Deleting relationship from %d to %d", $this->user_no, $_GET['to_user'] ); + dbg_error_log("User",":HandleAction: Deleting relationship to %d from %d", $this->user_no, $_GET['from_user'] ); if ( $this->AllowedTo("Admin") ) { - dbg_error_log("User",":HandleAction: Deleting relationship from %d to %d", $this->user_no, $_GET['to_user'] ); - $qry = new PgQuery("DELETE FROM relationship WHERE from_user=? AND to_user=?;", $this->user_no, $_GET['to_user'] ); + dbg_error_log("User",":HandleAction: Deleting relationship to %d from %d", $this->user_no, $_GET['from_user'] ); + $qry = new PgQuery("DELETE FROM relationship WHERE to_user=? AND from_user=?;", $this->user_no, $_GET['from_user'] ); if ( $qry->Exec() ) { $c->messages[] = i18n("Relationship deleted"); }