<!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>[756] branches/legacy: Merge r753 r754 r755 to legacy branch.</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><a href="http://unit-tests.trac.wordpress.org/changeset/756">756</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-30 13:34:45 +0000 (Sat, 30 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r753 r754 r755 to legacy branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheslegacywptestcasetestajaxactionstest_admin_ajax_replyto_commentphp">branches/legacy/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php</a></li>
<li><a href="#brancheslegacywptestcasetest_httpphp">branches/legacy/wp-testcase/test_http.php</a></li>
<li><a href="#brancheslegacywptestcasetest_queryphp">branches/legacy/wp-testcase/test_query.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#brancheslegacy">branches/legacy/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheslegacy"></a>
<div class="propset"><h4>Property changes: branches/legacy</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="brancheslegacywptestcasetestajaxactionstest_admin_ajax_replyto_commentphp"></a>
<div class="modfile"><h4>Modified: branches/legacy/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php (755 => 756)</h4>
<pre class="diff"><span>
<span class="info">--- branches/legacy/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php 2012-06-30 07:49:45 UTC (rev 755)
+++ branches/legacy/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php 2012-06-30 13:34:45 UTC (rev 756)
</span><span class="lines">@@ -206,9 +206,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * Reply to a post with a simulated database failure
</span><span class="cx"> * Expects test to fail
</span><ins>+ * @global $wpdb
</ins><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> public function test_blocked_comment() {
</span><ins>+ global $wpdb;
</ins><span class="cx">
</span><span class="cx"> // Become an administrator
</span><span class="cx"> $this->_setRole( 'administrator' );
</span><span class="lines">@@ -222,8 +224,15 @@
</span><span class="cx"> add_filter( 'query', array( $this, '_block_comments' ) );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieStopException', '1' );
- $this->_handleAjax( 'replyto-comment' );
</del><ins>+ try {
+ $wpdb->suppress_errors( true );
+ $this->_handleAjax( 'replyto-comment' );
+ $wpdb->suppress_errors( false );
+ $this->fail();
+ } catch ( WPAjaxDieStopException $e ) {
+ $wpdb->suppress_errors( false );
+ $this->assertContains( '1', $e->getMessage() );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="brancheslegacywptestcasetest_httpphp"></a>
<div class="modfile"><h4>Modified: branches/legacy/wp-testcase/test_http.php (755 => 756)</h4>
<pre class="diff"><span>
<span class="info">--- branches/legacy/wp-testcase/test_http.php 2012-06-30 07:49:45 UTC (rev 755)
+++ branches/legacy/wp-testcase/test_http.php 2012-06-30 13:34:45 UTC (rev 756)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_file_stream() {
</span><del>- $url = 'http://unit-tests.svn.wordpress.org/wp-testdata/images/2004-07-22-DSC_0007.jpg'; // we'll test against a file in the unit test data
</del><ins>+ $url = 'http://unit-tests.svn.wordpress.org/branches/legacy/wp-testdata/images/2004-07-22-DSC_0007.jpg'; // we'll test against a file in the unit test data
</ins><span class="cx"> $size = 87348;
</span><span class="cx"> $res = wp_remote_request( $url, array( 'stream' => true, 'timeout' => 30 ) ); //Auto generate the filename.
</span><span class="cx">
</span></span></pre></div>
<a id="brancheslegacywptestcasetest_queryphp"></a>
<div class="modfile"><h4>Modified: branches/legacy/wp-testcase/test_query.php (755 => 756)</h4>
<pre class="diff"><span>
<span class="info">--- branches/legacy/wp-testcase/test_query.php 2012-06-30 07:49:45 UTC (rev 755)
+++ branches/legacy/wp-testcase/test_query.php 2012-06-30 13:34:45 UTC (rev 756)
</span><span class="lines">@@ -305,6 +305,11 @@
</span><span class="cx"> $this->assertQueryTrue('is_search');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_search_encoded_chars() {
+ $this->http('/search/F%C3%BCnf%2Bbar/');
+ $this->assertEquals( get_query_var( 's' ), 'Fünf+bar' );
+ }
+
</ins><span class="cx"> // 'category/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
</span><span class="cx"> // 'category/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
</span><span class="cx"> function test_category_feed() {
</span></span></pre>
</div>
</div>
</body>
</html>