From e24681632ef49bdcf39b00fda15000dde619ea5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Wed, 25 Nov 2015 22:19:26 +0000
Subject: [PATCH] Avoid potential fatal errors after [35718].

While these classes are intended for admin use, there are developers out there who include `wp-admin/includes/template.php` to access them in other contexts. There is no intention to continue to support this indefinitely, but a breaking change like that would need to happen very early in a cycle and communicated loudly.

In the meantime, if you're reading this commit message and you do the above, please update your code to not do that. Thank you :)

fixes #33413.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/admin.php    | 2 --
 wp-admin/includes/template.php | 6 ++++++
 wp-includes/version.php        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php
index eb2c161a78..a44abba917 100644
--- a/wp-admin/includes/admin.php
+++ b/wp-admin/includes/admin.php
@@ -58,8 +58,6 @@ require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
 
 /** WordPress Template Administration API */
 require_once(ABSPATH . 'wp-admin/includes/template.php');
-require_once(ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php');
-require_once(ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php');
 
 /** WordPress List Table Administration API and base class */
 require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 729b82b772..e65c7d0f23 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -8,6 +8,12 @@
  * @subpackage Administration
  */
 
+/** Walker_Category_Checklist class */ 
+require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );
+
+/** WP_Internal_Pointers class */ 
+require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
+
 //
 // Category Checklists
 //
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7b30ed946e..e6e74bd674 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta4-35739';
+$wp_version = '4.4-beta4-35740';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.