Merge commit 'origin/master' into fusionax

diff --cc include/validations/names.inc.php
index 2c3ff1a,3bdf153..3969f85
--- 1/include/validations/names.inc.php
--- 2/include/validations/nomusage.inc.php
+++ b/include/validations/names.inc.php
@@@ -123,11 -114,13 +123,15 @@@ class NamesReq extends Validat
      public function commit()
      {
          require_once 'notifs.inc.php';
 -        register_watch_op($this->user->id(), WATCH_FICHE, '', 'nom');
 -        require_once('user.func.inc.php');
 -        set_new_usage($this->user->id(), $this->nom_usage, $this->alias);
 +        require_once 'name.func.inc.php';
 +
 +        register_watch_op($this->user->id(), WATCH_FICHE, '', 'search_names');
 +        set_profile_display($this->display_names);
 +        set_alias_names($this->sn_new, $this->sn_old, true, $this->new_alias);
+ 
+         // Update the local User object, to pick up the new bestalias.
+         $this->user = User::getSilent($this->user->id());
+ 
          return true;
      }
  

diff --cc modules/admin.php
Simple merge