Return early if dot syntax is not being used.

cakephp · Oct 27, 2017 · 95496ed · 95496ed
1 parent 2784f16
commit 95496ed
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -897,18 +897,18 @@ public function association($name)
      */
     public function getAssociation($name)
     {
-        if (strpos($name, '.') !== false) {
-            list($name, $next) = array_pad(explode('.', $name, 2), 2, null);
-            $result = $this->_associations->get($name);
+        if (strpos($name, '.') === false) {
+            return $this->_associations->get($name);
+        }
 
-            if ($result !== null && $next !== null) {
-                $result = $result->getTarget()->association($next);
-            }
+        list($name, $next) = array_pad(explode('.', $name, 2), 2, null);
+        $result = $this->_associations->get($name);
 
-            return $result;
+        if ($result !== null && $next !== null) {
+            $result = $result->getTarget()->association($next);
         }
 
-        return $this->_associations->get($name);
+        return $result;
     }
 
     /**