NotifySend.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 1f41de4..69d1d57 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -156,11 +156,14 @@ class Pman_Core_NotifySend extends Pman
         
         // let's work out the last notification sent to this user..
         $l = DB_DataObject::factory($this->table);
-        $l->setFrom( array(
+        
+        $lar = array(
                 'ontable' => $w->ontable,
                 'onid' => $w->onid,
-                'person_id' => $w->person_id,
-        ));        
+        );
+        $lar[strtolower($w->person_table).'_id'] = $w->{strtolower($w->person_table).'_id'};
+        
+        $l->setFrom( $lar );       
         $l->whereAdd('id != '. $w->id);
         $l->orderBy('sent DESC');
         $l->limit(1);
@@ -243,7 +246,6 @@ class Pman_Core_NotifySend extends Pman
         // since some of them have spaces?!?!
         $p->email = trim($p->email);
         
-        
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
             $ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);