From 8c72f9cf5d995ee2d06db906e11b49b56b7cd860 Mon Sep 17 00:00:00 2001
From: Chris <chris@starforge.co.uk>
Date: Wed, 15 Aug 2012 14:52:46 +0100
Subject: [PATCH] Fixed brainos.

---
 Message/Queue.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Message/Queue.pm b/Message/Queue.pm
index 585ec7c..7f7319c 100644
--- a/Message/Queue.pm
+++ b/Message/Queue.pm
@@ -506,15 +506,15 @@ sub _delete_by_ident {
     $messh -> execute($ident)
         or return $self -> self_error("Unable to perform message ident lookup: ". $self -> {"dbh"} -> errstr);
 
-    my $deleted = 0;
+    my $deletecount = 0;
     while(my $msgid = $messh -> fetchrow_arrayref()) {
         my $result = $self -> _delete_by_id($msgid -> [0], $userid, $deleted);
         return undef if(!defined($result));
 
-        $deleted += $result;
+        $deletecount += $result;
     }
 
-    return $deleted;
+    return $deletecount;
 }
 
 
@@ -573,9 +573,9 @@ sub _delete_by_id {
     # Otherwise, nobody is marked as having seen the message, if it hasn't been sent, mark it as deleted
     my $nukeh = $self -> {"dbh"} -> prepare("UPDATE `".$self -> {"settings"} -> {"database"} -> {"message_queue"}."`
                                              SET deleted = ?, deleted_id = ?
-                                             WHERE $field = ?
+                                             WHERE $id = ?
                                              AND deleted IS NULL");
-    my $result = $nukeh -> execute($deleted, $userid, $value);
+    my $result = $nukeh -> execute($deleted, $userid, $messageid);
     return $self -> self_error("Unable to perform message delete: ". $self -> {"dbh"} -> errstr) if(!$result);
 
     $self -> {"logger"} -> log("messaging", $userid || 0, undef, "Delete of message $messageid row updated count: $result");