From b79a9ba30bca2b0d1829b3c01a95e8d2a1c2a720 Mon Sep 17 00:00:00 2001
From: jygaulier <gaulier@alchemy.fr>
Date: Wed, 31 Oct 2012 10:42:51 +0100
Subject: [PATCH] fix #976  edit : character change when editing with thesaurus
 fix also display caption junk when a thesaurus term has no entry in the
 current language

---
 lib/classes/caption/Field/Value.class.php | 2 +-
 www/prod/jquery.edit.js                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/classes/caption/Field/Value.class.php b/lib/classes/caption/Field/Value.class.php
index 604bdb739b..69dcf9d79a 100644
--- a/lib/classes/caption/Field/Value.class.php
+++ b/lib/classes/caption/Field/Value.class.php
@@ -470,7 +470,7 @@ class caption_Field_Value implements cache_cacheableInterface
                         break;
                     }
 
-                    $synonyms = $XPATH_thesaurus->query("sy[@lng='" . $session->usr_i18 . "']", $node->parentNode);
+                    $synonyms = $XPATH_thesaurus->query("sy[@lng='" . $session->get_I18n() . "']", $node->parentNode);
                     foreach ($synonyms as $synonym) {
                         $k = $synonym->getAttribute("k");
                         if ($synonym->getAttribute("w") != $term_noacc || $k != $context_noacc) {
diff --git a/www/prod/jquery.edit.js b/www/prod/jquery.edit.js
index 96866d0fac..ee3da94e3f 100644
--- a/www/prod/jquery.edit.js
+++ b/www/prod/jquery.edit.js
@@ -417,7 +417,7 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId)
       + '<table><tr><td>'
       + extra
       + '<span class="value" vocabId="' + (value.getVocabularyId() ? value.getVocabularyId() : '') + '">'
-      + word
+      + $('<div/>').text(word).html()
       + "</span></td><td class='options'>"
       + '<a href="#" class="add_all"><img src="/skins/icons/plus11.png"/></a> '
       + '<a href="#" class="remove_all"><img src="/skins/icons/minus11.png"/></a>'
@@ -1288,7 +1288,7 @@ function edit_dblclickThesaurus(event)	// ondblclick dans le thesaurus
       case "TH_W":
         if(p4.edit.curField >= 0)
         {
-          var w = e.innerHTML;
+          var w = $(e).text();
           if(p4.edit.T_fields[p4.edit.curField].multi)
           {
             $("#EditTextMultiValued", p4.edit.editBox).val(w);