Changeset 38908 for trunk/tests/phpunit/includes/install.php

Timestamp:

10/25/2016 11:05:17 AM (8 years ago)

Author:

pento

Message:

Tests: Fix a PHP notice introduced in [38907].

WP_DEFAULT_THEME was being defined in the wrong location.

Also, if WordPress has the original "default" theme installed, ensure that our test theme overrides it.

Props swissspidy for daring to dive into Themes of WordPress Past.
See #31550, #38457.

File:

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

trunk/tests/phpunit/includes/install.php

@@ -10 +10 @@
 $multisite = ! empty( $argv[2] );
 
+define( 'WP_INSTALLING', true );
+require_once $config_file_path;
+require_once dirname( __FILE__ ) . '/functions.php';
+
 // Set the theme to our special empty theme, to avoid interference from the current Twenty* theme.
 if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
     define( 'WP_DEFAULT_THEME', 'default' );
 }
-$wp_theme_directories = array( dirname( __FILE__ ) . '/../data/themedir1' );
-
-define( 'WP_INSTALLING', true );
-require_once $config_file_path;
-require_once dirname( __FILE__ ) . '/functions.php';
 
 tests_reset__SERVER();
@@ -33 +32 @@
 require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
 $phpmailer = new MockPHPMailer();
+
+register_theme_directory( dirname( __FILE__ ) . '/../data/themedir1' );
 
 /*