From f57bdbd238636a5f9b1022d3028b7e1969b212f4 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Tue, 13 May 2014 04:53:13 +0000 Subject: [PATCH] Eliminate use of `extract()` in `Custom_Image_Header::step_2()`. See #22400. git-svn-id: https://develop.svn.wordpress.org/trunk@28384 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/custom-header.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php index c68d2b5eb8..3344223eac 100644 --- a/src/wp-admin/custom-header.php +++ b/src/wp-admin/custom-header.php @@ -689,10 +689,14 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> if ( empty( $_POST ) && isset( $_GET['file'] ) ) { $attachment_id = absint( $_GET['file'] ); $file = get_attached_file( $attachment_id, true ); - $url = wp_get_attachment_image_src( $attachment_id, 'full'); + $url = wp_get_attachment_image_src( $attachment_id, 'full' ); $url = $url[0]; } elseif ( isset( $_POST ) ) { - extract($this->step_2_manage_upload()); + $data = $this->step_2_manage_upload(); + $attachment_id = $data['attachment_id']; + $file = $data['file']; + $url = $data['url']; + $type = $data['type']; } if ( file_exists( $file ) ) {