Changeset 38373

Timestamp:

08/26/2016 05:43:03 PM (8 years ago)

Author:

wonderboymusic

Message:

Load: remove session.php and, instead, move the 2 require calls to wp-settings.php. This simplifies the include path.

See #36335.

Location:

trunk/src

Files:

• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-includes/session.php (deleted)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-admin/includes/update-core.php

@@ -708 +708 @@
 // 4.7
 'wp-includes/locale.php',
+'wp-includes/session.php',
 );
 

trunk/src/wp-settings.php

@@ -150 +150 @@
 require( ABSPATH . WPINC . '/user.php' );
 require( ABSPATH . WPINC . '/class-wp-user-query.php' );
-require( ABSPATH . WPINC . '/session.php' );
+require( ABSPATH . WPINC . '/class-wp-session-tokens.php' );
+require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' );
 require( ABSPATH . WPINC . '/meta.php' );
 require( ABSPATH . WPINC . '/class-wp-meta-query.php' );