From 271e9b40a447f8ccd61282b2950930dde05d356c Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Fri, 2 Aug 2013 04:42:08 +0000 Subject: [PATCH] =?UTF-8?q?Remove=20`$pagenow`=20global=20from=20three=20f?= =?UTF-8?q?unctions=20that=20don=E2=80=99t=20use=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Props jeremyfelt. Fixes #24920. git-svn-id: https://develop.svn.wordpress.org/trunk@24974 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/media.php | 2 +- wp-admin/menu-header.php | 2 +- wp-includes/post-template.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index b8cc098179..4b6417f861 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1499,7 +1499,7 @@ function media_upload_header() { * @param unknown_type $errors */ function media_upload_form( $errors = null ) { - global $type, $tab, $pagenow, $is_IE, $is_opera; + global $type, $tab, $is_IE, $is_opera; if ( ! _device_can_upload() ) { echo '

' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'http://wordpress.org/mobile/' ) . '

'; diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index c158cc2037..1ea4f3238a 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -34,7 +34,7 @@ get_admin_page_parent(); * @param bool $submenu_as_parent */ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { - global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow; + global $self, $parent_file, $submenu_file, $plugin_page, $typenow; $first = true; // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 03302eab64..06d259e157 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -650,7 +650,7 @@ function wp_link_pages( $args = '' ) { $r = apply_filters( 'wp_link_pages_args', $r ); extract( $r, EXTR_SKIP ); - global $page, $numpages, $multipage, $more, $pagenow; + global $page, $numpages, $multipage, $more; $output = ''; if ( $multipage ) {