From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 28 Dec 2010 19:31:48 +0000 (+0100)
Subject: Merge branch 'xorg/1.0.2/master'
X-Git-Tag: xorg/1.1.0~254
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f8a1899eceabb9648adb85071fab66d49d549337;p=platal.git

Merge branch 'xorg/1.0.2/master'
---

f8a1899eceabb9648adb85071fab66d49d549337
diff --cc htdocs/javascript/profile.js
index a1c5eb2,a173e4b..527f806
--- a/htdocs/javascript/profile.js
+++ b/htdocs/javascript/profile.js
@@@ -351,7 -353,7 +357,7 @@@ function addTel(prefid, prefname, subFi
          i++;
      }
      $('#' + prefix + 'add').before('<div id="' + prefix + i + '" style="clear: both; padding-top: 4px; padding-bottom: 4px"></div>');
-     $('#' + prefix + i).updateHtml('profile/ajax/tel/' + prefid + '/' + prefname + '/' + i);
 -    Ajax.update_html(prefix + i, 'profile/ajax/tel/' + prefid + '/' + prefname + '/' + i + '/' + subField + '/' + mainField + '/' + mainId);
++    $('#' + prefix + i).updateHtml('profile/ajax/tel/' + prefid + '/' + prefname + '/' + i + '/' + subField + '/' + mainField + '/' + mainId);
  }
  
  function removeTel(prefname, prefid, id)