X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=abc1506921fdee29c75c40be6af41a358609524c;hb=c14fed651c0fb9a87e4abb3bb8af83871baa899a;hp=d6c27872d92b8272d850df0cb2f0f8a39379882f;hpb=6c908d8cc7a36920d2d1ace2dc887a72c3025679;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index d6c27872..abc15069 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -104,20 +104,19 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
                 ) as comptype_display_name
         ");
         
-        if(!empty($q['query']['name'])){
-            $s = $this->escape($q['query']['name']);
-            $this->whereAdd("
-                {$tn}.name LIKE '%$s%'
-            ");
-        }
-        if(!empty($q['search']['name'])){ 
-            $s = $this->escape($q['search']['name']);
+        if(!empty($q['query']['name']) || !empty($q['search']['name'])){
+            
+            $s = (!empty($q['query']['name'])) ? $this->escape($q['query']['name']) : $this->escape($q['search']['name']);
+            
             $this->whereAdd("
                 {$tn}.name LIKE '%$s%'
             ");
         }
-        if(!empty($q['search']['name_starts'])){
-            $s = $this->escape($q['search']['name_starts']);
+        
+        if(!empty($q['query']['name_starts']) || !empty($q['search']['name_starts'])){
+            
+            $s = (!empty($q['query']['name_starts'])) ? $this->escape($q['query']['name_starts']) : $this->escape($q['search']['name_starts']);
+            
             $this->whereAdd("
                 {$tn}.name LIKE '$s%'
             ");