From f95c0f6901fbe224a69d9561c0178c3161c2f459 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Wed, 10 Jul 2013 19:48:47 +0800
Subject: [PATCH] DataObjects/Core_notify.php

---
 DataObjects/Core_notify.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 0e80c6de..44a3160a 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -146,12 +146,14 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             switch ($q['query']['status']) {
                 
                 case 'SUCCESS';
-                    $this->is_active = 1;
+                    $this->whereAdd("msgid != ''");
                     break;
                 case 'FAILED';
+                    $this->whereAdd('event_id > 0 AND act_when <= NOW() ');
                     $this->is_active = 0;
                     break;
-                case 'PENDING';  
+                case 'PENDING';
+                    
                     $this->is_active = 0;
                     break;
                 case 'ALL':
-- 
2.39.2