Merge pull request #2293 from greezybacon/issue/null-domain-matchup

org: Fix matching of empty domain name

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.organization.php

@@ -166,6 +166,8 @@ class Organization extends OrganizationModel {
     }
 
     function isMappedToDomain($domain) {
+        if (!$domain || !$this->domain)
+            return false;
         foreach (explode(',', $this->domain) as $d) {
             $d = trim($d);
             if ($d[0] == '.') {
@@ -182,8 +184,12 @@ class Organization extends OrganizationModel {
     }
 
     static function forDomain($domain) {
-        foreach (static::objects()
-                ->filter(array('domain__contains'=>$domain)) as $org) {
+        if (!$domain)
+            return null;
+        foreach (static::objects()->filter(array(
+            'domain__gt'=>'',
+            'domain__contains'=>$domain
+        )) as $org) {
             if ($org->isMappedToDomain($domain)) {
                 return $org;
             }