Pman.Dialog.Image.bjs

[Pman.Core] / DataObjects / Person.php

diff --git a/DataObjects/Person.php b/DataObjects/Person.php
index 2df628a..8b16e61 100644 (file)
--- a/DataObjects/Person.php
+++ b/DataObjects/Person.php
@@ -217,6 +217,9 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
     
     function getEmailFrom()
     {
+        if (empty($this->name)) {
+            return $this->email;
+        }
         return '"' . addslashes($this->name) . '" <' . $this->email . '>';
     }
     function toEventString() 
@@ -794,7 +797,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         
         if(!empty($q['query']['name'])){
             $this->whereAdd("
-                $tn.name LIKE '%{$this->escape($q['query']['name'])}%'
+                Person.name LIKE '%{$this->escape($q['query']['name'])}%'
             ");
         }