Update core and cleanup code.

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

diff --git a/core b/core
index faeb823..857a2b9 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit faeb823b5ddb8e2613cfef9fd15b86a5d9a37890
+Subproject commit 857a2b960d47c1ef4990e6ed55bad2ed40681f66

diff --git a/modules/carnet.php b/modules/carnet.php
index 6f1b9a8..afd1a31 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -255,7 +255,7 @@ class CarnetModule extends PLModule
         $this->_add_rss_link($page);
 
         $uid  = S::i('uid');
-        $user = Env::v('user');
+        $user = S::user();
 
         // For XSRF protection, checks both the normal xsrf token, and the special RSS token.
         // It allows direct linking to contact adding in the RSS feed.
@@ -285,7 +285,6 @@ class CarnetModule extends PLModule
         }
 
         $search = false;
-        $user = S::user();
 
         require_once 'userset.inc.php';