Merge commit 'origin/master' into fusionax

Conflicts:
	templates/search/adv.form.tpl

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>

diff --cc modules/admin.php
Simple merge

diff --cc templates/search/adv.form.tpl
index 82fd654,7654438..28d9624
--- 1/templates/search/adv.form.tpl
--- 2/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@@ -71,17 -71,23 +71,17 @@@
  
    // when changing school, open diploma choice
    function changeSchool(schoolId) {
-     $(".autocompleteTarget[@name='school']").attr('value',schoolId);
+     $(".autocompleteTarget[name='school']").attr('value',schoolId);
  
      if (schoolId) {
-       $(".autocomplete[@name='schoolTxt']").addClass('hidden_valid');
+       $(".autocomplete[name='schoolTxt']").addClass('hidden_valid');
 -
 -      $("[name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
 -          if ($("select[name='diploma']").children("option").size() > 1) {
 -            $("select[name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
 -          } else {
 -            $("select[name='diploma']").attr('value', '');
 -          }
 -        });
      } else {
-       $(".autocomplete[@name='schoolTxt']").removeClass('hidden_valid');
+       $(".autocomplete[name='schoolTxt']").removeClass('hidden_valid');
 -
 -      $("select[name='diploma']").attr('value', '');
      }
-     $("[@name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
-         $("select[@name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
 +
++    $("[name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
++        $("select[name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
 +      });
    }
  
    // when choosing autocomplete from list, must validate