X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=f803fa67e1e212fd46c8721cccf83bcbe8fe2224;hb=4cb93dc15a755a4602cedabe6c1210770d828cf2;hp=1de9633e806d3a0cfed44bb2dd2c08862280faa9;hpb=ad4991d896747dc07c9ee40ea341a2635067d539;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 1de9633e..f803fa67 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -93,11 +93,10 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if(!empty($q['dup_check'])){
         	   $et = DB_DataObject::factory($tn);
-            $this->_join = "LEFT JOIN {$et->tableName()} AS evet ON (evet.id=Events.id)";
-            $this->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt ");        	   
+            $this->_join .= "LEFT JOIN {$et->tableName()} AS evet ON (evet.evet_id=Events.id)";
+            $this->selectAdd("(select count(*)+1 from Events where Events.dup_id = evet.evet_id) as cnt ");        	   
         	   $this->selectAs($et,'evet_%s','evet');
-        	   
-            
+        	   $this->having('Events.dup_id = 0 ');
             
         }
         /*