projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a270415
)
DataObjects/Events.php
author
Alan Knowles
<alan@roojs.com>
Thu, 2 Nov 2017 03:17:29 +0000
(11:17 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 2 Nov 2017 03:17:29 +0000
(11:17 +0800)
DataObjects/Events.php
patch
|
blob
|
history
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
4f5e952
..
7c7533b
100644
(file)
--- 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");
}
$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)));
}
$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));
}
$this->whereAdd(implode(' OR ' , $w));
}
- if ($obj && method_exists($obj,'relatedEventsWhere')) {
- $a = $obj->relatedEventsWhere($q,$roo);
- if($a){
- $this->whereAdd($a);
- }
- }
-
-
-
+
}
}