adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing parsing of translated data after switching to virtualFields

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-10-26 17:52:40 -04:30
parent 02635696d7
commit 9f27fa7dfb
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cake/libs/model/behaviors/translate.php
View file

@ -206,27 +206,28 @@ class TranslateBehavior extends ModelBehavior {
foreach ($results as $key => &$row) { foreach ($results as $key => &$row) {
$results[$key][$model->alias]['locale'] = (is_array($locale)) ? current($locale) : $locale; $results[$key][$model->alias]['locale'] = (is_array($locale)) ? current($locale) : $locale;
foreach ($beforeFind as $_f => $field) { foreach ($beforeFind as $_f => $field) {
$aliasField = is_numeric($_f) ? $field : $_f;
if (is_array($locale)) { if (is_array($locale)) {
foreach ($locale as $_locale) { foreach ($locale as $_locale) {
if (!isset($results[$key][$model->alias][$field]) && !empty($results[$key]['I18n__'.$field.'__'.$_locale]['content'])) { if (!isset($row[$model->alias][$aliasField]) && !empty($row[$model->alias]['i18n_'.$field.'_'.$_locale])) {
$results[$key][$model->alias][$field] = $results[$key]['I18n__'.$field.'__'.$_locale]['content']; $row[$model->alias][$aliasField] = $row[$model->alias]['i18n_'.$field.'_'.$_locale];
$row[$model->alias]['locale'] = $_locale;
} }
unset($results[$key]['I18n__'.$field.'__'.$_locale]); unset($row[$model->alias]['i18n_'.$field.'_'.$_locale]);
} }
if (!isset($results[$key][$model->alias][$field])) { if (!isset($row[$model->alias][$aliasField])) {
$results[$key][$model->alias][$field] = ''; $row[$model->alias][$aliasField] = '';
} }
} else { } else {
$value = ''; $value = '';
if (!empty($row[$model->alias]['_i18n_' . $field])) { if (!empty($row[$model->alias]['i18n_' . $field])) {
$value = $row[$model->alias]['_i18n_' . $field]; $value = $row[$model->alias]['i18n_' . $field];
} }
$aliasField = is_numeric($_f) ? $field : $_f;
$row[$model->alias][$aliasField] = $value; $row[$model->alias][$aliasField] = $value;
unset($row[$model->alias]['_i18n_' . $field]); unset($row[$model->alias]['i18n_' . $field]);
} }
} }
} }