<!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>[25397] trunk: * Fill in undefined var in `Tests_Option_BlogOption`</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://core.trac.wordpress.org/changeset/25397">25397</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-12 07:16:30 +0000 (Thu, 12 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Fill in undefined var in `Tests_Option_BlogOption`
* Add `defined()` check for `BLOGSUPLOADDIR`
* Suppress deprecated function notices for `is_blog_user()` and `get_dashboard_blog()`
* Check existence of `$user` in `wpmu_log_new_registrations()` before arbitrarily making a database query
Fixes all notices in multisite unit tests.
See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunktestsphpunittestsmsphp">trunk/tests/phpunit/tests/ms.php</a></li>
<li><a href="#trunktestsphpunittestsoptionblogOptionphp">trunk/tests/phpunit/tests/option/blogOption.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-functions.php (25396 => 25397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-functions.php 2013-09-12 06:56:20 UTC (rev 25396)
+++ trunk/src/wp-includes/ms-functions.php 2013-09-12 07:16:30 UTC (rev 25397)
</span><span class="lines">@@ -1476,7 +1476,8 @@
</span><span class="cx"> function wpmu_log_new_registrations( $blog_id, $user_id ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $user = get_userdata( (int) $user_id );
</span><del>- $wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
</del><ins>+ if ( $user )
+ $wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ms.php (25396 => 25397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ms.php 2013-09-12 06:56:20 UTC (rev 25396)
+++ trunk/tests/phpunit/tests/ms.php 2013-09-12 07:16:30 UTC (rev 25397)
</span><span class="lines">@@ -11,6 +11,28 @@
</span><span class="cx">
</span><span class="cx"> protected $plugin_hook_count = 0;
</span><span class="cx">
</span><ins>+ function setUp() {
+ parent::setUp();
+
+ $_SERVER['REMOTE_ADDR'] = '';
+ add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
+ }
+
+ function tearDown() {
+ parent::tearDown();
+ remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
+ }
+
+ function deprecated_function_run_check( $function ) {
+ if ( in_array( $function, array( 'is_blog_user', 'get_dashboard_blog' ) ) )
+ add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+ }
+
+ function filter_deprecated_function_trigger_error() {
+ remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+ return false;
+ }
+
</ins><span class="cx"> function test_create_and_delete_blog() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -308,7 +330,7 @@
</span><span class="cx"> $this->assertFalse( upload_is_user_over_quota( $echo ) );
</span><span class="cx"> $this->assertTrue( is_upload_space_available() );
</span><span class="cx">
</span><del>- if ( ! file_exists( BLOGSUPLOADDIR ) )
</del><ins>+ if ( defined( 'BLOGSUPLOADDIR' ) && ! file_exists( BLOGSUPLOADDIR ) )
</ins><span class="cx"> $this->markTestSkipped( 'This test is broken when blogs.dir does not exist. ');
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -525,7 +547,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Test fetching a blog that doesn't exist and again after it exists.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @ticket 23405
</span><span class="cx"> */
</span><span class="cx"> function test_get_blog_details_blog_does_not_exist() {
</span><span class="lines">@@ -1013,7 +1035,7 @@
</span><span class="cx"> 'user_login' => $spam_username,
</span><span class="cx"> ) );
</span><span class="cx"> update_user_status( $spam_user_id, 'spam', '1' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->assertTrue( is_user_spammy( $spam_username ) );
</span><span class="cx"> $this->assertFalse( is_user_spammy( 'testuser1' ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionblogOptionphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/option/blogOption.php (25396 => 25397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/option/blogOption.php 2013-09-12 06:56:20 UTC (rev 25396)
+++ trunk/tests/phpunit/tests/option/blogOption.php 2013-09-12 07:16:30 UTC (rev 25397)
</span><span class="lines">@@ -5,6 +5,12 @@
</span><span class="cx"> * @group option
</span><span class="cx"> */
</span><span class="cx"> class Tests_Option_BlogOption extends WP_UnitTestCase {
</span><ins>+ function setUp() {
+ parent::setUp();
+
+ $_SERVER['REMOTE_ADDR'] = null;
+ }
+
</ins><span class="cx"> function test_from_same_site() {
</span><span class="cx"> $key = rand_str();
</span><span class="cx"> $key2 = rand_str();
</span><span class="lines">@@ -81,6 +87,7 @@
</span><span class="cx"> function test_with_another_site() {
</span><span class="cx"> global $current_site, $base;
</span><span class="cx">
</span><ins>+ $title = 'Fooblog';
</ins><span class="cx"> $domain = 'blogoptiontest';
</span><span class="cx">
</span><span class="cx"> if ( is_subdomain_install() ) {
</span></span></pre>
</div>
</div>
</body>
</html>