mikaelkael
2010-09-18 20:32:25 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22971] standard/trunk/library/Zend/Log/Writer/Mail.php: [ZF-9990] Fix test error with PHP 5.3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22971</dd>
<dt>Author</dt> <dd>mikaelkael</dd>
<dt>Date</dt> <dd>2010-09-18 13:32:24 -0700 (Sat, 18 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-9990] Fix test error with PHP 5.3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendLogWriterMailphp">standard/trunk/library/Zend/Log/Writer/Mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunklibraryZendLogWriterMailphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Log/Writer/Mail.php (22970 => 22971)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Log/Writer/Mail.php 2010-09-18 20:06:16 UTC (rev 22970)
+++ standard/trunk/library/Zend/Log/Writer/Mail.php 2010-09-18 20:32:24 UTC (rev 22971) </span><span class="lines">@@ -102,7 +102,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * MethodMap for Zend_Mail's headers </span><del>- * </del><ins>+ * </ins><span class="cx"> * @var array </span><span class="cx"> */ </span><span class="cx"> protected static $_methodMapHeaders = array( </span><span class="lines">@@ -134,7 +134,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Create a new instance of Zend_Log_Writer_Mail </span><del>- * </del><ins>+ * </ins><span class="cx"> * @param array|Zend_Config $config </span><span class="cx"> * @return Zend_Log_Writer_Mail </span><span class="cx"> */ </span><span class="lines">@@ -160,7 +160,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Set the layout </span><del>- * </del><ins>+ * </ins><span class="cx"> * @param Zend_Layout|array $layout </span><span class="cx"> * @return Zend_Log_Writer_Mail </span><span class="cx"> * @throws Zend_Log_Exception </span><span class="lines">@@ -182,7 +182,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Construct a Zend_Mail instance based on a configuration array </span><del>- * </del><ins>+ * </ins><span class="cx"> * @param array $config </span><span class="cx"> * @return Zend_Mail </span><span class="cx"> */ </span><span class="lines">@@ -209,7 +209,7 @@ </span><span class="cx"> if (count($headerAddresses)) { </span><span class="cx"> foreach ($headerAddresses as $header => $address) {
</span><span class="cx"> $method = self::$_methodMapHeaders[$header];
</span><del>- if (is_array($address) && isset($address['name'])
</del><ins>+ if (is_array($address) && isset($address['name'])
</ins><span class="cx"> && !is_numeric($address['name'])
</span><span class="cx"> ) {
</span><span class="cx"> $params = array(
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> $address['name']
</span><span class="cx"> );
</span><span class="cx"> } else if (is_array($address) && isset($address['email'])) {
</span><del>- $params = $address['email'];
</del><ins>+ $params = array($address['email']);
</ins><span class="cx"> } else {
</span><span class="cx"> $params = array($address);
</span><span class="cx"> }
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Construct a Zend_Layout instance based on a configuration array
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param array $config
</span><span class="cx"> * @return Zend_Layout
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22971] standard/trunk/library/Zend/Log/Writer/Mail.php: [ZF-9990] Fix test error with PHP 5.3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22971</dd>
<dt>Author</dt> <dd>mikaelkael</dd>
<dt>Date</dt> <dd>2010-09-18 13:32:24 -0700 (Sat, 18 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-9990] Fix test error with PHP 5.3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendLogWriterMailphp">standard/trunk/library/Zend/Log/Writer/Mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunklibraryZendLogWriterMailphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Log/Writer/Mail.php (22970 => 22971)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Log/Writer/Mail.php 2010-09-18 20:06:16 UTC (rev 22970)
+++ standard/trunk/library/Zend/Log/Writer/Mail.php 2010-09-18 20:32:24 UTC (rev 22971) </span><span class="lines">@@ -102,7 +102,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * MethodMap for Zend_Mail's headers </span><del>- * </del><ins>+ * </ins><span class="cx"> * @var array </span><span class="cx"> */ </span><span class="cx"> protected static $_methodMapHeaders = array( </span><span class="lines">@@ -134,7 +134,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Create a new instance of Zend_Log_Writer_Mail </span><del>- * </del><ins>+ * </ins><span class="cx"> * @param array|Zend_Config $config </span><span class="cx"> * @return Zend_Log_Writer_Mail </span><span class="cx"> */ </span><span class="lines">@@ -160,7 +160,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Set the layout </span><del>- * </del><ins>+ * </ins><span class="cx"> * @param Zend_Layout|array $layout </span><span class="cx"> * @return Zend_Log_Writer_Mail </span><span class="cx"> * @throws Zend_Log_Exception </span><span class="lines">@@ -182,7 +182,7 @@ </span><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Construct a Zend_Mail instance based on a configuration array </span><del>- * </del><ins>+ * </ins><span class="cx"> * @param array $config </span><span class="cx"> * @return Zend_Mail </span><span class="cx"> */ </span><span class="lines">@@ -209,7 +209,7 @@ </span><span class="cx"> if (count($headerAddresses)) { </span><span class="cx"> foreach ($headerAddresses as $header => $address) {
</span><span class="cx"> $method = self::$_methodMapHeaders[$header];
</span><del>- if (is_array($address) && isset($address['name'])
</del><ins>+ if (is_array($address) && isset($address['name'])
</ins><span class="cx"> && !is_numeric($address['name'])
</span><span class="cx"> ) {
</span><span class="cx"> $params = array(
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> $address['name']
</span><span class="cx"> );
</span><span class="cx"> } else if (is_array($address) && isset($address['email'])) {
</span><del>- $params = $address['email'];
</del><ins>+ $params = array($address['email']);
</ins><span class="cx"> } else {
</span><span class="cx"> $params = array($address);
</span><span class="cx"> }
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Construct a Zend_Layout instance based on a configuration array
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param array $config
</span><span class="cx"> * @return Zend_Layout
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>