Cloning references to field tables from main I18n

This should make any subsequent calls to TableRegistry::get work as expected.
cakephp · Jan 7, 2015 · e0961e7 · e0961e7
1 parent 2bea4c1
commit e0961e7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php
@@ -115,20 +115,23 @@ public function initialize(array $config)
      */
     public function setupFieldAssociations($fields, $table, $model, $strategy)
     {
+        $targetTable = TableRegistry::get($table);
         $targetAlias = Inflector::slug($table);
         $alias = $this->_table->alias();
         $filter = $this->_config['onlyTranslated'];
 
         foreach ($fields as $field) {
             $name = $alias . '_' . $field . '_translation';
 
+            $fieldTable = TableRegistry::set($name, $targetTable);
             $this->_table->hasOne($name, [
                 'className' => $table,
                 'foreignKey' => 'foreign_key',
+                'targetTable' => $fieldTable,
                 'joinType' => $filter ? 'INNER' : 'LEFT',
                 'conditions' => [
-                    $name . '.model' => $model,
-                    $name . '.field' => $field,
+                    $fieldTable->alias() . '.model' => $model,
+                    $fieldTable->alias() . '.field' => $field,
                 ],
                 'propertyName' => $field . '_translation'
             ]);