Changeset 7818 for trunk/tests/includes/testcase.php

Timestamp:

02/07/2014 01:03:38 AM (11 years ago)

Author:

boonebgorges

Message:

Improve go_to() current_blog determining logic in test suite

It's necessary to zero out the current_blog and current_site globals, and then
to use some of the additional fallbacks in ms-settings.php to determine the
correct site.

File:

• trunk/tests/includes/testcase.php (modified) (2 diffs)

trunk/tests/includes/testcase.php

@@ -93 +93 @@
         // REQUEST_URI; mostly copied from /wp-includes/ms-settings.php
         if ( is_multisite() ) {
+            $GLOBALS['current_blog'] = $GLOBALS['current_site'] = $GLOBALS['blog_id'] = null;
+
             $domain = addslashes( $_SERVER['HTTP_HOST'] );
             if ( false !== strpos( $domain, ':' ) ) {
@@ -134 +136 @@
             }
 
+            if ( $GLOBALS['current_site'] && ! $GLOBALS['current_blog'] ) {
+                $GLOBALS['current_blog'] = get_blog_details( array( 'domain' => $GLOBALS['current_site']->domain, 'path' => $GLOBALS['current_site']->path ), false );
+            }
+
             $GLOBALS['blog_id'] = $GLOBALS['current_blog']->blog_id;
         }