From 3d42303a29849d296efb2a479e419753321da5a2 Mon Sep 17 00:00:00 2001 From: Edward Date: Tue, 25 Jun 2013 19:56:21 +0800 Subject: [PATCH] DataObjects/Core_notify.php --- DataObjects/Core_notify.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index f9e8a548..618a9ec9 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -122,24 +122,24 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject function applyFilters($q, $au, $roo) { -// if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) { -// // this will only work on tables not joined to ours. -// -// //DB_DAtaObject::DebugLevel(1); -// // then we can build a join.. -// $d = DB_DataObject::Factory($q['ontable']); -// $d->autoJoin(); -// $this->selectAdd($d->_query['data_select']); -// $this->_join .= " -// LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id -// {$d->_join} -// "; -// } -// if (isset($q['query']['person_id_name']) ) { -// $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'"); -// -// } -// + if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) { + // this will only work on tables not joined to ours. + + //DB_DAtaObject::DebugLevel(1); + // then we can build a join.. + $d = DB_DataObject::Factory($q['ontable']); + $d->autoJoin(); + $this->selectAdd($d->_query['data_select']); + $this->_join .= " + LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id + {$d->_join} + "; + } + if (isset($q['query']['person_id_name']) ) { + $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'"); + + } + -- 2.39.2