X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Fnomusage.inc.php;h=3bdf153f1af8e0594efb718ab05a78d63f57bf00;hb=19b00bcab8013c805bbc0e6a99868382480ce365;hp=b4471b034ecc1dc3f59eb64cc4618075d00644c8;hpb=5daf68f6846682e439570b5245a6109ada8d9304;p=platal.git

diff --git a/include/validations/nomusage.inc.php b/include/validations/nomusage.inc.php
index b4471b0..3bdf153 100644
--- a/include/validations/nomusage.inc.php
+++ b/include/validations/nomusage.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -44,7 +44,7 @@ class UsageReq extends Validate
     // }}}
     // {{{ constructor
 
-    public function __construct(User $_user, $_usage, $_reason)
+    public function __construct(User &$_user, $_usage, $_reason)
     {
         parent::__construct($_user, true, 'usage');
         $this->nom_usage = $_usage;
@@ -61,7 +61,7 @@ class UsageReq extends Validate
                   FROM  auth_user_md5 as u
              LEFT JOIN  aliases       as e ON(e.type='alias' AND FIND_IN_SET('usage',e.flags) AND e.id = u.user_id)
              LEFT JOIN  aliases       as a ON(a.alias = {?} AND a.id != u.user_id)
-                 WHERE  u.user_id = {?}", $this->alias, $this->uid);
+                 WHERE  u.user_id = {?}", $this->alias, $this->user->id());
         list($this->oldalias, $this->oldusage, $this->homonyme) = $res->fetchOneRow();
     }
 
@@ -114,9 +114,13 @@ class UsageReq extends Validate
     public function commit()
     {
         require_once 'notifs.inc.php';
-        register_watch_op($this->user->id(), WATCH_FICHE, 'nom');
+        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);
+
+        // Update the local User object, to pick up the new bestalias.
+        $this->user = User::getSilent($this->user->id());
+
         return true;
     }