Changeset 21009 for trunk/wp-admin/custom-header.php

Timestamp:

06/06/2012 04:48:53 PM (14 years ago)

Author:

ryan

Message:

Check context before adding media upload filters. Props SergeyBiryukov. fixes #20819

File:

• trunk/wp-admin/custom-header.php (modified) (3 diffs)

trunk/wp-admin/custom-header.php

@@ -95 +95 @@
             add_action("admin_head-$page", $this->admin_header_callback, 51);
 
-        add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
-        add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
-        add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
+        if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) {
+            add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
+            add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
+            add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
+        }
     }
 
@@ -973 +975 @@
      */
     function attachment_fields_to_edit( $form_fields, $post ) {
-        if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) {
-            $form_fields = array();
-            $href = esc_url(add_query_arg(array(
-                'page' => 'custom-header',
-                'step' => 2,
-                '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
-                'file' => $post->ID
-            ), admin_url('themes.php')));
-
-            $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-location="' . $href . '" class="wp-set-header">' . __( 'Set as header' ) . '</a></td></tr>' );
-            $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-header' );
-        }
+        $form_fields = array();
+        $href = esc_url(add_query_arg(array(
+            'page' => 'custom-header',
+            'step' => 2,
+            '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
+            'file' => $post->ID
+        ), admin_url('themes.php')));
+
+        $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-location="' . $href . '" class="wp-set-header">' . __( 'Set as header' ) . '</a></td></tr>' );
+        $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-header' );
 
         return $form_fields;
@@ -994 +994 @@
      * @since 3.4.0
      */
-    function filter_upload_tabs( $tabs ) {
-        if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' )
-            return array( 'library' => __('Media Library') );
-
-        return $tabs;
+    function filter_upload_tabs() {
+        return array( 'library' => __('Media Library') );
     }