From 37e4f7eef7135cc89a61590aa0ee33bd28ad0748 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Thu, 6 Jan 2011 18:07:38 +0100
Subject: [PATCH] Only return the bare email address if there is no full name.

---
 framework/Prefs/lib/Horde/Prefs/Identity.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/framework/Prefs/lib/Horde/Prefs/Identity.php b/framework/Prefs/lib/Horde/Prefs/Identity.php
index c8b5bdf12..6c5ca3cd5 100644
--- a/framework/Prefs/lib/Horde/Prefs/Identity.php
+++ b/framework/Prefs/lib/Horde/Prefs/Identity.php
@@ -388,9 +388,10 @@ class Horde_Prefs_Identity
         $addr = $this->getValue($this->_prefnames['from_addr']);
         if (empty($addr)) {
             $addr = $this->_user;
-            if (empty($from_addr)) {
-                return $addr;
-            }
+        }
+
+        if (empty($from_addr)) {
+            return $addr;
         }
 
         return $from_addr . '<' . $addr . '>';
-- 
2.11.0