name_or_email search

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 2a3ac07..1498a61 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -1093,6 +1093,14 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 {$this->tableName()}.name LIKE '%{$this->escape($q['query']['name'])}%'
             ");
         }
+        
+         if(!empty($q['query']['name_or_email'])){
+            $this->whereAdd("
+                {$this->tableName()}.name LIKE '%{$this->escape($q['query']['name'])}%'
+                OR
+                {$this->tableName()}.email LIKE '%{$this->escape($q['query']['name'])}%'
+            ");
+        }
          if(!empty($q['query']['name_starts'])){
             $this->whereAdd("
                 {$this->tableName()}.name LIKE '{$this->escape($q['query']['name_starts'])}%'

diff --git a/mysql/i18n_translate.sql b/mysql/i18n_translate.sql
index 23c287c..d77ad0b 100644 (file)
--- a/mysql/i18n_translate.sql
+++ b/mysql/i18n_translate.sql
@@ -11,4 +11,4 @@ CREATE FUNCTION i18n_translate(in_ltype  varchar(1) , in_lkey varchar(8), in_inl
         RETURN ret;
         
     END $$
-DELIMITER ;
\ No newline at end of file
+DELIMITER;
\ No newline at end of file