From f992b7a5586a214d1704c9e74b7d1299e2c87a03 Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sun, 13 Jun 2010 22:57:41 +0200
Subject: [PATCH] Try not to return empty email if you can find one

---
 classes/pluser.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/classes/pluser.php b/classes/pluser.php
index c4ae622..339a527 100644
--- a/classes/pluser.php
+++ b/classes/pluser.php
@@ -135,11 +135,17 @@ abstract class PlUser
 
     public function bestEmail()
     {
-        return $this->bestalias;
+        if (!empty($this->bestalias)) {
+            return $this->bestalias;
+        }
+        return $this->email;
     }
     public function forlifeEmail()
     {
-        return $this->forlife;
+        if (!empty($this->forlife)) {
+            return $this->forlife;
+        }
+        return $this->email;
     }
 
     public function displayName()
-- 
2.1.4