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 --git a/htdocs/javascript/profile.js b/htdocs/javascript/profile.js
index 4c7d01f..108ce44 100644 (file)
--- a/htdocs/javascript/profile.js
+++ b/htdocs/javascript/profile.js
@@ -47,7 +47,7 @@ function wizPage_onLoad(id)
             updateJobSecteur(i, 'job_' + i, 'jobs[' + i + ']',
                              document.forms.prof_annu["jobs[" + i + "][ss_secteur]"].value);
         }
-        registerEnterpriseAutocomplete(-1);
+        setTimeout('registerEnterpriseAutocomplete(-1)', 100);
         break;
     }
 }

diff --git a/include/validations/medals.inc.php b/include/validations/medals.inc.php
index 98d14d2..599ba21 100644 (file)
--- a/include/validations/medals.inc.php
+++ b/include/validations/medals.inc.php
@@ -101,7 +101,7 @@ class MedalReq extends Validate
     public function commit ()
     {
         require_once 'notifs.inc.php';
-        register_watch_op($this->uid, WATCH_FICHE, 'medals');
+        register_watch_op($this->uid, WATCH_FICHE, '', 'medals');
         return XDB::execute('REPLACE INTO  profile_medals_sub
                                    VALUES  ({?}, {?}, {?})',
                             $this->uid, $this->mid, $this->gid);

diff --git a/include/validations/nomusage.inc.php b/include/validations/nomusage.inc.php
index 788d7c6..15f3e8e 100644 (file)
--- a/include/validations/nomusage.inc.php
+++ b/include/validations/nomusage.inc.php
@@ -110,7 +110,7 @@ class UsageReq extends Validate
     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;

diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php
index b2fc0a1..0f2d109 100644 (file)
--- a/include/validations/photos.inc.php
+++ b/include/validations/photos.inc.php
@@ -141,7 +141,7 @@ class PhotoReq extends Validate
         XDB::execute('REPLACE INTO  photo (uid, attachmime, attach, x, y)
                             VALUES  ({?},{?},{?},{?},{?})',
                      $this->uid, $this->mimetype, $this->data, $this->x, $this->y);
-        register_watch_op($this->uid, WATCH_FICHE, 'photo');
+        register_watch_op($this->uid, WATCH_FICHE, '', 'photo');
         return true;
     }