TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start rewriting

Browse Source
This commit is contained in:
Etienne Roudeix
2013-08-29 08:49:48 +02:00
parent 253a0b76d8
commit 696b871acd
27 changed files with 173 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
View File

@@ -109,10 +109,14 @@ class ModelCriteriaTools
}
}
$askedLocale = $lang === null ? $currentLocale : $localeSearch->getLocale();
if($backendContext) {
self::getBackEndI18n($search, $lang === null ? $currentLocale : $localeSearch->getLocale(), $columns, $foreignTable, $foreignKey);
self::getBackEndI18n($search, $askedLocale, $columns, $foreignTable, $foreignKey);
} else {
self::getFrontEndI18n($search, $defaultLangWithoutTranslation, $lang === null ? $currentLocale : $localeSearch->getLocale(), $columns, $foreignTable, $foreignKey);
self::getFrontEndI18n($search, $defaultLangWithoutTranslation, $askedLocale, $columns, $foreignTable, $foreignKey);
}
return $askedLocale;
}
}