Retrieves forlifeEmailAlternate from core.
authorStéphane Jacob <sj@m4x.org>
Tue, 8 Mar 2011 08:41:56 +0000 (09:41 +0100)
committerStéphane Jacob <sj@m4x.org>
Tue, 8 Mar 2011 08:41:56 +0000 (09:41 +0100)
Signed-off-by: Stéphane Jacob <sj@m4x.org>
classes/user.php
core

index b11bacf..038fea7 100644 (file)
@@ -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 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit a6522bb9e59e898a417a7da1acdd31ba45838c86
+Subproject commit 38d66919e0b8d40eb28d2ffcf81ae11f8452cfe1