Changeset 25397

Timestamp:

09/12/2013 07:16:30 AM (13 years ago)

Author:

wonderboymusic

Message:

• 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 #25282.

Location:

trunk

Files:

• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/ms.php (modified) (4 diffs)
• tests/phpunit/tests/option/blogOption.php (modified) (2 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -1477 +1477 @@
         global $wpdb;
         $user = get_userdata( (int) $user_id );
-        $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')) );
+        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')) );
 }
 

trunk/tests/phpunit/tests/ms.php

@@ -11 +11 @@
 
         protected $plugin_hook_count = 0;
+
+        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;
+        }
 
         function test_create_and_delete_blog() {
@@ -309 +331 @@
                 $this->assertTrue( is_upload_space_available() );
 
-                if ( ! file_exists( BLOGSUPLOADDIR ) )
+                if ( defined( 'BLOGSUPLOADDIR' ) && ! file_exists( BLOGSUPLOADDIR ) )
                         $this->markTestSkipped( 'This test is broken when blogs.dir does not exist. ');
 
@@ -526 +548 @@
         /**
          * Test fetching a blog that doesn't exist and again after it exists.
-         * 
+         *
          * @ticket 23405
          */
@@ -1014 +1036 @@
                 ) );
                 update_user_status( $spam_user_id, 'spam', '1' );
-                
+
                 $this->assertTrue( is_user_spammy( $spam_username ) );
                 $this->assertFalse( is_user_spammy( 'testuser1' ) );

trunk/tests/phpunit/tests/option/blogOption.php

@@ -6 +6 @@
  */
 class Tests_Option_BlogOption extends WP_UnitTestCase {
+        function setUp() {
+                parent::setUp();
+
+                $_SERVER['REMOTE_ADDR'] = null;
+        }
+
         function test_from_same_site() {
                 $key = rand_str();
@@ -82 +88 @@
                 global $current_site, $base;
 
+                $title = 'Fooblog';
                 $domain = 'blogoptiontest';