cvs: php4 /pear/Mail RFC822.php
| From: | Richard Heyes | Date: | Mon, 29 Oct 2001 14:22:30 +0000 |
| Subject: | cvs: php4 /pear/Mail RFC822.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-1186@lists.php.net to get a copy of this message | ||
heyesr Mon Oct 29 09:22:30 2001 EDT
Modified files:
/php4/pear/Mail RFC822.php
Log:
Altered so that if no "personal" is supplied, comments are *not* used as
personal instead.
Index: php4/pear/Mail/RFC822.php
diff -u php4/pear/Mail/RFC822.php:1.15 php4/pear/Mail/RFC822.php:1.16
--- php4/pear/Mail/RFC822.php:1.15 Mon Oct 29 09:16:21 2001
+++ php4/pear/Mail/RFC822.php Mon Oct 29 09:22:30 2001
@@ -38,7 +38,7 @@
*
* @author Richard Heyes <richard@phpguru.org>
* @author Chuck Hagenbuch <chuck@horde.org>
-* @version $Revision: 1.15 $
+* @version $Revision: 1.16 $
* @package Mail
*/
@@ -614,18 +614,9 @@
// Construct the object that will be returned.
$mbox = new stdClass();
- // If we have a phrase, use that as personal, else use comment
- if (trim($phrase) == '') {
- if (trim($comment) == '') {
- $mbox->personal = '';
- } else {
- $mbox->personal = implode(',', $comments);
- }
- } else {
-
- $mbox->personal = $phrase;
- $mbox->comment = $comments;
- }
+ // Add the phrase (even if empty) and comments
+ $mbox->personal = $phrase;
+ $mbox->comment = isset($comments) ? $comments : array();
if (isset($route_addr)) {
$mbox->mailbox = $route_addr['local_part'];