Changeset 31116

Timestamp:

01/09/2015 09:06:13 PM (12 years ago)

Author:

wonderboymusic

Message:

In Custom_Background and Custom_Header:

• In ->init(), don't check current_user_can() since add_theme_page() will return false immediately if the cap check fails.
• Bail if add_theme_page() returns false
• wp_check_filetype_and_ext() doesn't need a 3rd param, it already defaults to null. Passing false would fail a strict check.

See #30799.

Location:

trunk/src/wp-admin

Files:

• custom-background.php (modified) (2 diffs)
• custom-header.php (modified) (2 diffs)

trunk/src/wp-admin/custom-background.php

@@ -126 +126 @@
          */
         public function init() {
-                if ( ! current_user_can('edit_theme_options') )
+                $page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
+                if ( ! $page ) {
                         return;
-
-                $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
-
-                add_action("load-$page", array($this, 'admin_load'));
-                add_action("load-$page", array($this, 'take_action'), 49);
-                add_action("load-$page", array($this, 'handle_upload'), 49);
-
-                if ( $this->admin_header_callback )
-                        add_action("admin_head-$page", $this->admin_header_callback, 51);
+                }
+
+                $this->page = $page;
+
+                add_action( "load-$page", array( $this, 'admin_load' ) );
+                add_action( "load-$page", array( $this, 'take_action' ), 49 );
+                add_action( "load-$page", array( $this, 'handle_upload' ), 49 );
+
+                if ( $this->admin_header_callback ) {
+                        add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+                }
         }
 
@@ -428 +431 @@
 
                 $uploaded_file = $_FILES['import'];
-                $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'], false );
+                $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
                 if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
                         wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );

trunk/src/wp-admin/custom-header.php

@@ -144 +144 @@
          */
         public function init() {
-                if ( ! current_user_can('edit_theme_options') )
+                $page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) );
+                if ( ! $page ) {
                         return;
-
-                $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
-
-                add_action("admin_print_scripts-$page", array($this, 'js_includes'));
-                add_action("admin_print_styles-$page", array($this, 'css_includes'));
-                add_action("admin_head-$page", array($this, 'help') );
-                add_action("admin_head-$page", array($this, 'take_action'), 50);
-                add_action("admin_head-$page", array($this, 'js'), 50);
-                if ( $this->admin_header_callback )
-                        add_action("admin_head-$page", $this->admin_header_callback, 51);
-
+                }
+
+                $this->page = $page;
+
+                add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) );
+                add_action( "admin_print_styles-$page", array( $this, 'css_includes' ) );
+                add_action( "admin_head-$page", array( $this, 'help' ) );
+                add_action( "admin_head-$page", array( $this, 'take_action' ), 50 );
+                add_action( "admin_head-$page", array( $this, 'js' ), 50 );
+                if ( $this->admin_header_callback ) {
+                        add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+                }
         }
 
@@ -863 +865 @@
 
                 $uploaded_file = $_FILES['import'];
-                $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'], false );
+                $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
                 if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
                         wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );