Permalink
Browse files

Avoid appending an extra space in mailFrom() when $params is empty.

Bug: 17989
  • Loading branch information...
1 parent 9979fbf commit 7a5dee7596411c3aee95f11f6101facfb86ffd24 @jparise jparise committed Oct 26, 2010
Showing with 3 additions and 3 deletions.
  1. +1 −1 SMTP.php
  2. +2 −2 package.xml
View
@@ -830,7 +830,7 @@ function mailFrom($sender, $params = null)
} elseif (trim($params['verp'])) {
$args .= ' XVERP=' . $params['verp'];
}
- } elseif (is_string($params)) {
+ } elseif (is_string($params) && !empty($params)) {
$args .= ' ' . $params;
}
View
@@ -22,15 +22,15 @@
<date>2010-10-21</date>
<time>08:50:00</time>
<version>
- <release>1.4.4</release>
+ <release>1.4.5</release>
<api>1.1.3</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license/3_01.txt">PHP License</license>
- <notes>Corrected a problem with SMTP servers that don't support the SIZE feature. (Bug 17942)
+ <notes>Avoid appending an extra space in mailFrom() when $params is empty. (Bug 17989)
</notes>
<contents>
<dir baseinstalldir="Net" name="/">

0 comments on commit 7a5dee7

Please sign in to comment.