From c38c6a21baefbb1982cd7592307ca39d238bc695 Mon Sep 17 00:00:00 2001 From: gwoo Date: Sun, 13 Apr 2008 04:18:10 +0000 Subject: [PATCH] updating TranslateBehavior to handle one set of content per model, not per alias. fixes #4461 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6655 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/model/behaviors/translate.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php index 8dfb1e18a..f90209614 100644 --- a/cake/libs/model/behaviors/translate.php +++ b/cake/libs/model/behaviors/translate.php @@ -92,7 +92,7 @@ class TranslateBehavior extends ModelBehavior { 'table' => $db->name($tablePrefix . $RuntimeModel->useTable), 'conditions' => array( $model->alias.'.id' => '{$__cakeIdentifier['.$RuntimeModel->alias.'.foreign_key]__$}', - $RuntimeModel->alias.'.model' => $model->alias, + $RuntimeModel->alias.'.model' => $model->name, $RuntimeModel->alias.'.locale' => $locale ) ); @@ -149,7 +149,7 @@ class TranslateBehavior extends ModelBehavior { 'table' => $db->name($tablePrefix . $RuntimeModel->useTable), 'conditions' => array( $model->alias.'.id' => '{$__cakeIdentifier[I18n__'.$field.'__'.$_locale.'.foreign_key]__$}', - 'I18n__'.$field.'__'.$_locale.'.model' => $model->alias, + 'I18n__'.$field.'__'.$_locale.'.model' => $model->name, 'I18n__'.$field.'__'.$_locale.'.'.$RuntimeModel->displayField => $field, 'I18n__'.$field.'__'.$_locale.'.locale' => $_locale ) @@ -163,7 +163,7 @@ class TranslateBehavior extends ModelBehavior { 'table' => $db->name($tablePrefix . $RuntimeModel->useTable), 'conditions' => array( $model->alias.'.id' => '{$__cakeIdentifier[I18n__'.$field.'.foreign_key]__$}', - 'I18n__'.$field.'.model' => $model->alias, + 'I18n__'.$field.'.model' => $model->name, 'I18n__'.$field.'.'.$RuntimeModel->displayField => $field ) );