[ #500564 ] "" in From header causes empty From

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2212 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 81c0d9429998b89a82b6571053aa59df5960aac7..71af54aa82fb8b49456dea7413b2b0f9db8ced87 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -362,7 +362,11 @@ function sqimap_find_displayable_name ($string) {
     $string = trim($string);
     
     if ( ereg('^(.+)<.*>', $string, $regs) ) {
     $string = trim($string);
     
     if ( ereg('^(.+)<.*>', $string, $regs) ) {

+        $orig_string = $string;

         $string = ereg_replace ('"', '', $regs[1] );
         $string = ereg_replace ('"', '', $regs[1] );

+        if (trim($string) == '') {
+             $string = sqimap_find_email($orig_string);
+        }

         if( $string == '' || $string == ' ' ){
             $string = '&nbsp';
         }
         if( $string == '' || $string == ' ' ){
             $string = '&nbsp';
         }