X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_server.php;h=10db21f959f7e7dcdd58e9c1f98423f8cabd9bce;hb=bf4c3855253f5330943cd86509d756255c8c6596;hp=aa625c1b7c2a1edd154c5984e7e19b43913ee18d;hpb=c1b1bedb71d3a2818c1a031ea944e2c920cf3785;p=Pman.Core

diff --git a/DataObjects/Core_notify_server.php b/DataObjects/Core_notify_server.php
index aa625c1b..10db21f9 100644
--- a/DataObjects/Core_notify_server.php
+++ b/DataObjects/Core_notify_server.php
@@ -191,8 +191,7 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
                 sent < '2000-01-01'
                 and
                 event_id = 0
-                and
-                act_start < NOW() +  INTERVAL 3 HOUR 
+        
                 and
                 server_id IN (" . implode(",", $ids) . ")
         ");
@@ -209,7 +208,9 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
         $target_len = floor(  ($totalq + $total_add) / $num_servers );
         
         foreach($in_q as $sid => $cq) {
-            
+            if ( $target_len - $cq < 1) {
+                continue;
+            }
             $up[ $sid ] = array_slice($to_add, 0, $target_len - $cq);
         }
         foreach($to_add as $i) {