Ticket #27208: 27208.diff

wp-load.php

@@ -20 +20 @@
 
 /** Define ABSPATH as this file's directory */
 define( 'ABSPATH', dirname(__FILE__) . '/' );
+define( 'WPINC', 'wp-includes' );
 
 error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 
+require_once( ABSPATH . WPINC . '/plugin.php' );
+
 if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
         /** The config file resides in ABSPATH */

wp-settings.php

@@ -15 +15 @@
  *
  * @since 1.0.0
  */
-define( 'WPINC', 'wp-includes' );
+if (!defined( 'WPINC' ))
+    define( 'WPINC', 'wp-includes' );
 
 // Include files required for initialization.
 require( ABSPATH . WPINC . '/load.php' );
@@ -72 +73 @@
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp.php' );
 require( ABSPATH . WPINC . '/class-wp-error.php' );
-require( ABSPATH . WPINC . '/plugin.php' );
+require_once( ABSPATH . WPINC . '/plugin.php' );
 require( ABSPATH . WPINC . '/pomo/mo.php' );
 
 // Include the wpdb class and, if present, a db.php database drop-in.