alecpl
2010-09-29 e99991996dbb9e7b0b0ff6cfa94dc0fb2522eb66
program/include/rcube_imap.php
@@ -3505,7 +3505,7 @@
            $address = trim($val['address']);
            $name = trim($val['name']);
            if (preg_match('/^[\'"]/', $name) && preg_match('/[\'"]$/', $name))
            if ($name && preg_match('/^[\'"]/', $name) && preg_match('/[\'"]$/', $name))
                $name = trim($name, '\'"');
            if ($name && $address && $name != $address)
@@ -3515,7 +3515,8 @@
            else if ($name)
                $string = $name;
            $out[$j] = array('name' => $name,
            $out[$j] = array(
                'name'   => $name,
                'mailto' => $address,
                'string' => $string
            );
@@ -3912,9 +3913,9 @@
                    $result[$key]['name'] .= (empty($result[$key]['name'])?'':' ').str_replace("\"",'',stripslashes($v));
            }
            if (empty($result[$key]['name']))
                $result[$key]['name'] = $result[$key]['address'];
            elseif (empty($result[$key]['address']))
//          if (empty($result[$key]['name']))
//              $result[$key]['name'] = $result[$key]['address'];
            if (empty($result[$key]['address']))
                $result[$key]['address'] = $result[$key]['name'];
        }