From 524effb58f37e3e690ca6481ae2cf2d80fa61f8a Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 26 Aug 2016 17:45:17 +0000
Subject: [PATCH] Load: remove `session.php` and, instead, move the 2 `require`
 calls to `wp-settings.php`. This simplifies the include path.

See #36335.

Built from https://develop.svn.wordpress.org/trunk@38373


git-svn-id: http://core.svn.wordpress.org/trunk@38314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/update-core.php | 1 +
 wp-includes/session.php           | 9 ---------
 wp-includes/version.php           | 2 +-
 wp-settings.php                   | 3 ++-
 4 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 wp-includes/session.php

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 50ce6ddb93..d18675b797 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -707,6 +707,7 @@ $_old_files = array(
 'wp-admin/includes/class-wp-automatic-upgrader.php', // Wrong file name, see #37628.
 // 4.7
 'wp-includes/locale.php',
+'wp-includes/session.php',
 );
 
 /**
diff --git a/wp-includes/session.php b/wp-includes/session.php
deleted file mode 100644
index 380d6398e5..0000000000
--- a/wp-includes/session.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Session API
- *
- * @since 4.0.0
- */
-
-require_once( ABSPATH . WPINC . '/class-wp-session-tokens.php' );
-require_once( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' );
\ No newline at end of file
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 495b55d31c..6b7817338f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38372';
+$wp_version = '4.7-alpha-38373';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index 08117198d0..de9c0b77d8 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -149,7 +149,8 @@ require( ABSPATH . WPINC . '/class-wp-theme.php' );
 require( ABSPATH . WPINC . '/template.php' );
 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' );
 require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' );