Merge branch 'xorg/1.0.2/master'

diff --cc classes/userfilter.php
Simple merge

diff --cc configs/platal.ini
Simple merge

diff --cc htdocs/javascript/profile.js
index a1c5eb2,a173e4b..527f806
--- 1/htdocs/javascript/profile.js
--- 2/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)

diff --cc modules/admin.php
Simple merge

diff --cc modules/email.php
Simple merge

diff --cc modules/profile.php
Simple merge

diff --cc modules/search.php
Simple merge

diff --cc templates/admin/index.tpl
Simple merge

diff --cc templates/include/emails.combobox.tpl
Simple merge