projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_person.php
[Pman.Core]
/
DataObjects
/
Core_watch.php
diff --git
a/DataObjects/Core_watch.php
b/DataObjects/Core_watch.php
index
38eefd5
..
4a30b81
100644
(file)
--- a/
DataObjects/Core_watch.php
+++ b/
DataObjects/Core_watch.php
@@
-26,7
+26,7
@@
*
*
*/
*
*
*/
-require_once 'DB/DataObject.php';
+
class_exists('DB_DataObject') ? '' :
require_once 'DB/DataObject.php';
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
{
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
{
@@
-58,7
+58,11
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
$this->selectAdd("
substr( event, 1, LOCATE( '.',event) -1) as event_left,
$this->selectAdd("
substr( event, 1, LOCATE( '.',event) -1) as event_left,
- substr( event, LOCATE( '.',event)) as event_right
+ substr( event, LOCATE( '.',event) +1) as event_right,
+ (SELECT
+ display_name FROM core_enum where etype = '{$this->escape($q['_split_event_name'])}'
+ AND name = substr( event, LOCATE( '.',event) +1)
+ ) as event_right_display_name
");
");
@@
-214,7
+218,7
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
function notifyEvent($event)
{
//print_r($event);
function notifyEvent($event)
{
//print_r($event);
- //DB_DataObject::DebugLevel(1);
+
//DB_DataObject::DebugLevel(1);
// see if there are any watches on events..
// notify everyone flagged except the person doing it...
// this is very basic logic... -
// see if there are any watches on events..
// notify everyone flagged except the person doing it...
// this is very basic logic... -
@@
-231,12
+235,14
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
$w->event = $event->action;
$w->active = 1;
$w->event = $event->action;
$w->active = 1;
-
- $w->whereAdd('person_id != '. (int) $event->person_id);
+ // not sure why this is here... - it breaks on the reader article ->
+ if ($event->person_id) {
+ $w->whereAdd('person_id != '. (int) $event->person_id);
+ }
$watches = $w->fetchAll();
$watches = $w->fetchAll();
- //print_R($watches);
//exit;
+ //print_R($watches);
$nn = DB_DataObject::Factory('core_notify');
$nn->ontable = $event->on_table;
$nn = DB_DataObject::Factory('core_notify');
$nn->ontable = $event->on_table;