From 4c249c34457a3af0b41c628ad15c5deb6f9a031f Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Wed, 25 Nov 2015 22:18:49 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@35740 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/admin.php | 2 -- src/wp-admin/includes/template.php | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/admin.php b/src/wp-admin/includes/admin.php index eb2c161a78..a44abba917 100644 --- a/src/wp-admin/includes/admin.php +++ b/src/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/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index 729b82b772..e65c7d0f23 100644 --- a/src/wp-admin/includes/template.php +++ b/src/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 //