From 81813902daaa2a50c9cebdb49c153bbc15dbfe84 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 11 Oct 2010 11:07:06 -0700
Subject: [PATCH] Short circuit the instancation of a Message earlier.

---
 lib/WebGUI/Inbox/Message.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Inbox/Message.pm b/lib/WebGUI/Inbox/Message.pm
index f06c58be0..305c37ae5 100644
--- a/lib/WebGUI/Inbox/Message.pm
+++ b/lib/WebGUI/Inbox/Message.pm
@@ -429,14 +429,15 @@ sub new {
     return undef unless $messageId;
 
     my $inbox = $session->db->getRow("inbox","messageId",$messageId);
+
+    #Don't return messages that don't exist
+    return undef unless (scalar(keys %{$inbox}));
+
     my $statusValues = $session->db->quickHashRef(
         q{ select isRead, repliedTo, deleted from inbox_messageState where messageId=? and userId=? },
         [$messageId,$userId]
     );
 
-    #Don't return messages that don't exist
-    return undef unless (scalar(keys %{$inbox}));
-
     #Don't return deleted messages
     return undef if($statusValues->{deleted});