From 2a0a841a137b414925b0a28fab6a0403a23d5691 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Thu, 1 Oct 2015 01:23:25 +0000 Subject: [PATCH] Declare the `$submenu_file` global to avoid a notice generated by passing it as a parameter to the `submenu_file` hook, introduced in [34722]. Fixes #24531. Built from https://develop.svn.wordpress.org/trunk@34724 git-svn-id: http://core.svn.wordpress.org/trunk@34688 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/menu-header.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index 0f067f247e..11c17db3da 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -23,7 +23,7 @@ $self = preg_replace('|^.*/mu-plugins/|i', '', $self); * @global array $submenu * @global string $parent_file */ -global $menu, $submenu, $parent_file; +global $menu, $submenu, $parent_file, $submenu_file; /** * Filter the parent file of an admin menu sub-menu item. diff --git a/wp-includes/version.php b/wp-includes/version.php index 50595711bc..33c7688306 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34723'; +$wp_version = '4.4-alpha-34724'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.