From e392c8725035d1c9d15b3cef1aea55143f9a26eb Mon Sep 17 00:00:00 2001
From: Brady Wetherington <uberbrady@gmail.com>
Date: Tue, 5 Jan 2016 13:08:14 -0800
Subject: [PATCH] Experimental fix for Company scope issue.

---
 app/models/Company.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/models/Company.php b/app/models/Company.php
index 8efb542052..7bf236721b 100644
--- a/app/models/Company.php
+++ b/app/models/Company.php
@@ -95,7 +95,7 @@ final class Company extends Elegant
 
     public static function scopeCompanyableChildren(array $companyable_names, $query)
     {
-        if      (count($companyable_names) == 0)                 { throw new Exception('-_-'); }
+        if      (count($companyable_names) == 0)                 { throw new Exception('No Companyable Children to scope'); }
         else if (!static::isFullMultipleCompanySupportEnabled()) { return $query;              }
         else
         {
@@ -103,14 +103,15 @@ final class Company extends Elegant
             {
                 static::scopeCompanyablesDirectly($q);
             };
+            
+            $q = $query->where(function ($q) {
+              $q2 = $q->whereHas($companyable_names[0], $f);
 
-            $q = $query->whereHas($companyable_names[0], $f);
-
-            for ($i = 1; $i < count($companyable_names); $i++)
-            {
-                $q = $q->orWhereHas($companyable_names[$i], $f);
-            }
-
+              for ($i = 1; $i < count($companyable_names); $i++)
+              {
+                  $q2 = $q2->orWhereHas($companyable_names[$i], $f);
+              }
+            });
             return $q;
         }
     }