From 35c5adad1d86aed4acbc6994bc2db330c0d13da9 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 2 Nov 2017 11:17:29 +0800 Subject: [PATCH] DataObjects/Events.php --- DataObjects/Events.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/DataObjects/Events.php b/DataObjects/Events.php index 4f5e9523..7c7533b0 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -218,7 +218,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $roo->jerr("ontable is invalid"); } - if (!method_exists($obj,'relatedWhere') && !method_exists($obj,'relatedEventsWhere')) { + if (!method_exists($obj,'relatedWhere')) { $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere or relatedEventsWhere:" . implode(',', get_class_methods($obj))); } @@ -243,15 +243,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $this->whereAdd(implode(' OR ' , $w)); } - if ($obj && method_exists($obj,'relatedEventsWhere')) { - $a = $obj->relatedEventsWhere($q,$roo); - if($a){ - $this->whereAdd($a); - } - } - - - + } -- 2.39.2