From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Tue, 30 Jun 2009 10:27:29 +0000 (+0200)
Subject: Use latest core : move "promo" user field from core to platal
X-Git-Tag: xorg/0.10.1~28
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=956608bc859d37e1eccfdfdd0c3a0b2bfac25b3d;p=platal.git

Use latest core : move "promo" user field from core to platal

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/classes/user.php b/classes/user.php
index eb8390d..c50b78c 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -21,6 +21,9 @@
 
 class User extends PlUser
 {
+    // Additional fields (non core)
+    protected $promo = null;
+
     // Implementation of the login to uid method.
     protected function getLogin($login)
     {
diff --git a/core b/core
index 7b08f6b..6c36b90 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7b08f6b5b31bf94e1b707895a9cb043d62faba3e
+Subproject commit 6c36b907ae72344efb81730e3b41a0ddc9473cec