diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php index 07e2635f2..8223b7e87 100644 --- a/lib/Cake/Model/Behavior/TranslateBehavior.php +++ b/lib/Cake/Model/Behavior/TranslateBehavior.php @@ -216,7 +216,7 @@ class TranslateBehavior extends ModelBehavior { * * @param Model $Model The model being worked on. * @param array $query The query array to append joins to. - * @param string $addFields The fields being joined. + * @param array $addFields The fields being joined. * @return array The modified query */ protected function _addAllJoins(Model $Model, $query, $addFields) { diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php index f2c1713b9..3b6a54b5f 100644 --- a/lib/Cake/Test/Case/Model/ModelReadTest.php +++ b/lib/Cake/Test/Case/Model/ModelReadTest.php @@ -6442,7 +6442,7 @@ class ModelReadTest extends BaseModelTest { 'table' => (object)array( 'tablePrefix' => '', 'table' => 'article_i18n', - 'schemaName' => 'test', + 'schemaName' => 'cakephp_test', ), 'conditions' => array( 'TranslatedArticle.id' => (object)array( @@ -6460,7 +6460,7 @@ class ModelReadTest extends BaseModelTest { 'table' => (object)array( 'tablePrefix' => '', 'table' => 'article_i18n', - 'schemaName' => 'test', + 'schemaName' => 'cakephp_test', ), 'conditions' => array( 'TranslatedArticle.id' => (object)array( @@ -6528,7 +6528,7 @@ class ModelReadTest extends BaseModelTest { 'table' => (object)array( 'tablePrefix' => '', 'table' => 'article_i18n', - 'schemaName' => 'test', + 'schemaName' => 'cakephp_test', ), 'conditions' => array( 'TranslatedArticle.id' => (object)array(