From b41001d4a1294272849e532a7715fda1fd908227 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Sat, 3 Dec 2016 04:30:34 +0000
Subject: [PATCH] Load: Re-add `class-wp-upgrader-skins.php`, `class-feed.php`,
 `locale.php`, and `session.php`.

Several files were removed during 4.7 that can be loaded externally, so we need to keep them, though their use is now deprecated.

Merges [39449], [39450], [39453], [39455], and [39456] to the 4.7 branch.
Fixes #39027.


Built from https://develop.svn.wordpress.org/branches/4.7@39459


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-upgrader-skins.php | 43 +++++++++++++++++++
 wp-admin/includes/update-core.php             |  8 ++--
 wp-includes/class-feed.php                    | 18 ++++++++
 wp-includes/locale.php                        | 10 +++++
 wp-includes/session.php                       | 11 +++++
 wp-includes/version.php                       |  2 +-
 6 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 wp-admin/includes/class-wp-upgrader-skins.php
 create mode 100644 wp-includes/class-feed.php
 create mode 100644 wp-includes/locale.php
 create mode 100644 wp-includes/session.php

diff --git a/wp-admin/includes/class-wp-upgrader-skins.php b/wp-admin/includes/class-wp-upgrader-skins.php
new file mode 100644
index 0000000000..183a01193e
--- /dev/null
+++ b/wp-admin/includes/class-wp-upgrader-skins.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * The User Interface "Skins" for the WordPress File Upgrader
+ *
+ * @package WordPress
+ * @subpackage Upgrader
+ * @since 2.8.0
+ */
+
+_deprecated_file( basename( __FILE__ ), '4.7.0', 'class-wp-upgrader.php' );
+
+/** WP_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php';
+
+/** Plugin_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php';
+
+/** Theme_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php';
+
+/** Bulk_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php';
+
+/** Bulk_Plugin_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php';
+
+/** Bulk_Theme_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php';
+
+/** Plugin_Installer_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php';
+
+/** Theme_Installer_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php';
+
+/** Language_Pack_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php';
+
+/** Automatic_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-automatic-upgrader-skin.php';
+
+/** WP_Ajax_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php';
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 645a3465f9..65d2717356 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -706,10 +706,10 @@ $_old_files = array(
 // 4.6
 'wp-admin/includes/class-wp-automatic-upgrader.php', // Wrong file name, see #37628.
 // 4.7
-'wp-admin/includes/class-wp-upgrader-skins.php',
-'wp-includes/class-feed.php',
-'wp-includes/locale.php',
-'wp-includes/session.php',
+// Don't delete, yet: 'wp-admin/includes/class-wp-upgrader-skins.php',
+// Don't delete, yet: 'wp-includes/class-feed.php',
+// Don't delete, yet: 'wp-includes/locale.php',
+// Don't delete, yet: 'wp-includes/session.php',
 'wp-includes/customize/class-wp-customize-themes-panel.php', // Removed in beta; when the feature comes back remember to remove it from this array. See #37661.
 );
 
diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
new file mode 100644
index 0000000000..62dd1195df
--- /dev/null
+++ b/wp-includes/class-feed.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Feed API
+ *
+ * @package WordPress
+ * @subpackage Feed
+ */
+
+_deprecated_file( basename( __FILE__ ), '4.7.0', 'fetch_feed()' );
+
+if ( ! class_exists( 'SimplePie', false ) ) {
+	require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+}
+
+require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' );
+require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' );
+require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' );
+require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
\ No newline at end of file
diff --git a/wp-includes/locale.php b/wp-includes/locale.php
new file mode 100644
index 0000000000..6a459e3e34
--- /dev/null
+++ b/wp-includes/locale.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Locale API
+ *
+ * @package WordPress
+ * @subpackage i18n
+ * @since 1.2.0
+ */
+
+_deprecated_file( basename( __FILE__ ), '4.7.0' );
diff --git a/wp-includes/session.php b/wp-includes/session.php
new file mode 100644
index 0000000000..d9175c9895
--- /dev/null
+++ b/wp-includes/session.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Session API
+ *
+ * @since 4.0.0
+ */
+
+_deprecated_file( basename( __FILE__ ), '4.7.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 b358b7861a..7bf66a01a2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-RC1-39458';
+$wp_version = '4.7-RC1-39459';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.