Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-06-19 16:11:27 +02:00
parent a8da584666
commit 1250f8ab0b
60 changed files with 880 additions and 2417 deletions

View File

@@ -386,7 +386,7 @@ class caption_Field_Value implements cache_cacheableInterface
$bestnote = 0;
foreach ($nodes as $node) {
$note = 0;
$note += ($node->getAttribute("lng") == $this->app['locale.I18n']) ? 4 : 0;
$note += ($node->getAttribute("lng") == $this->app['locale']) ? 4 : 0;
$note += ($node->getAttribute("w") == $term_noacc) ? 2 : 0;
if($context_noacc != "")
$note += ($node->getAttribute("k") == $context_noacc) ? 1 : 0;