Breaking out model for conditions

cakephp · Feb 4, 2015 · edc9e7f · edc9e7f
1 parent 4fe1b11
commit edc9e7f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php
@@ -110,8 +110,15 @@ public function initialize(array $config)
         } else {
             $this->_translationTable = TableRegistry::get($translationAlias);
         }
-
-        $this->config('conditions.model', $this->config('model') ?: $this->config('conditions.model') ?: $this->_table->alias());
+
+        if ($this->config('model')) {
+            $model = $this->config('model');
+        } elseif ($this->config('conditions.model')) {
+            $model = $this->config('conditions.model');
+        } else {
+            $model = $this->_table->alias();
+        }
+        $this->config('conditions.model', $model);
 
         $this->setupFieldAssociations(
             $this->_config['fields'],