Assign default locator by reference so it could follow instances swap…

…ped in TableRegistry facade.
cakephp · May 5, 2015 · cc0faab · cc0faab
1 parent 872df7a
commit cc0faab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ORM/Locator/LocatorAwareTrait.php b/src/ORM/Locator/LocatorAwareTrait.php
@@ -43,7 +43,8 @@ public function locator(LocatorInterface $locator = null)
             $this->_locator = $locator;
         }
         if (!$this->_locator) {
-            $this->_locator = TableRegistry::locator();
+            $locator = TableRegistry::locator();
+            $this->_locator =& $locator;
         }
         return $this->_locator;
     }