projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed display error in From-lines of the form: "Doe, John" <john@doe.org>
[squirrelmail.git]
/
functions
/
imap_general.php
diff --git
a/functions/imap_general.php
b/functions/imap_general.php
index 71af54aa82fb8b49456dea7413b2b0f9db8ced87..a5955e6c06b5f17fad0a4ab50912abe50c433d04 100755
(executable)
--- a/
functions/imap_general.php
+++ b/
functions/imap_general.php
@@
-360,10
+360,10
@@
function sqimap_find_email ($string) {
*/
function sqimap_find_displayable_name ($string) {
$string = trim($string);
*/
function sqimap_find_displayable_name ($string) {
$string = trim($string);
-
+
if ( ereg('^(.+)<.*>', $string, $regs) ) {
$orig_string = $string;
if ( ereg('^(.+)<.*>', $string, $regs) ) {
$orig_string = $string;
- $string =
ereg
_replace ('"', '', $regs[1] );
+ $string =
str
_replace ('"', '', $regs[1] );
if (trim($string) == '') {
$string = sqimap_find_email($orig_string);
}
if (trim($string) == '') {
$string = sqimap_find_email($orig_string);
}
@@
-383,7
+383,7
@@
function sqimap_find_displayable_name ($string) {
}
}
else {
}
}
else {
- $string = s
qimap_find_email($string
);
+ $string = s
tr_replace ('"', '', sqimap_find_email($string)
);
}
return trim($string);
}
return trim($string);