Dealing with the creation of i18n field tables elsewhere

cakephp · Jan 7, 2015 · 3d32968 · 3d32968
1 parent b4f6dcf
commit 3d32968
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php
@@ -125,11 +125,15 @@ public function setupFieldAssociations($fields, $table, $model, $strategy)
         foreach ($fields as $field) {
             $name = $alias . '_' . $field . '_translation';
 
-            $fieldTable = TableRegistry::get($name, [
-                'className' => $table,
-                'alias' => $name,
-                'table' => $targetTable->table()
-            ]);
+            if (!TableRegistry::exists($name)) {
+                $fieldTable = TableRegistry::get($name, [
+                    'className' => $table,
+                    'alias' => $name,
+                    'table' => $targetTable->table()
+                ]);
+            } else {
+                $fieldTable = TableRegistry::get($name);
+            }
 
             $this->_table->hasOne($name, [
                 'targetTable' => $fieldTable,
@@ -361,7 +365,7 @@ protected function _rowMapper($results, $locale)
             foreach ($this->_config['fields'] as $field) {
                 $name = $field . '_translation';
                 $translation = isset($row[$name]) ? $row[$name] : null;
-         
+
                 if ($translation === null || $translation === false) {
                     unset($row[$name]);
                     continue;