projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdb42e6
)
DataObjects/Events.php
author
Alan Knowles
<alan@akbkhome.com>
Mon, 14 May 2012 04:18:32 +0000
(12:18 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Mon, 14 May 2012 04:18:32 +0000
(12:18 +0800)
DataObjects/Events.php
patch
|
blob
|
history
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
d9029fc
..
7b71e35
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-229,11
+229,14
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$cols[$col][] = "WHEN {$tn}.person_table = '$tbl' THEN join_person_table_{$tbl}.{$col}";
}
// id's are hard coded...
+ $cond = "{$tn}.person_table = '{$tbl}'";
+ if ($tbl = $ptbl) {
+ $cond = "( $cond OR {$tn}.person_table == '')";
+ }
$this->_join .= "
LEFT JOIN {$tbl} AS join_person_table_{$tbl}
ON {$tn}.person_id = join_person_table_{$tbl}.id
- AND {$tn}.person_table = '{$tbl}'
-
+ AND $cond
";
}
foreach($cols as $col=>$whens) {