Merge branch 'platal-0.9.17'

Conflicts:

	templates/events/rss.tpl
	templates/xnetgrp/announce-rss.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --combined include/validations/nomusage.inc.php
index 788d7c6,a5ba225..15f3e8e
--- 1/include/validations/nomusage.inc.php
--- 2/include/validations/nomusage.inc.php
+++ b/include/validations/nomusage.inc.php
@@@ -49,6 -49,7 +49,6 @@@ class UsageReq extends Validat
          parent::__construct($_uid, true, 'usage');
          $this->nom_usage  = $_usage;
          $this->reason = $_reason;
 -        require_once 'xorg.misc.inc.php';
          $this->alias   = make_username($this->prenom, $this->nom_usage);
          if (!$this->nom_usage) $this->alias = "";
  
@@@ -110,7 -111,7 +110,7 @@@
      public function commit()
      {
          require_once 'notifs.inc.php';
-         register_watch_op($this->uid, WATCH_FICHE, 'nom');
+         register_watch_op($this->uid, WATCH_FICHE, '', 'nom');
          require_once('user.func.inc.php');
          $this->bestalias = set_new_usage($this->uid, $this->nom_usage, $this->alias);
          return true;