From 72e12532436d45acbb427b987386eff2bdff169e Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Tue, 8 Mar 2011 09:41:56 +0100
Subject: [PATCH] Retrieves forlifeEmailAlternate from core.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 classes/user.php | 8 ++++++++
 core             | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/classes/user.php b/classes/user.php
index b11bacf..038fea7 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -362,6 +362,14 @@ class User extends PlUser
         }
     }
 
+    public function forlifeEmailAlternate()
+    {
+        if (!empty($this->forlife_alternate)) {
+            return $this->forlife_alternate;
+        }
+        return $this->email;
+    }
+
     /** Fetch existing auxiliary alias.
      */
     public function emailAlias()
diff --git a/core b/core
index a6522bb..38d6691 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit a6522bb9e59e898a417a7da1acdd31ba45838c86
+Subproject commit 38d66919e0b8d40eb28d2ffcf81ae11f8452cfe1
-- 
2.1.4