Changeset 22778

Timestamp:

11/21/2012 05:44:49 PM (14 years ago)

Author:

nacin

Message:

Remove legacy media uploader bits from custom-header.php and custom-background.php. see #22186, #21390.

Location:

trunk/wp-admin

Files:

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

trunk/wp-admin/custom-background.php

@@ -73 +73 @@
                 add_action("load-$page", array(&$this, 'take_action'), 49);
                 add_action("load-$page", array(&$this, 'handle_upload'), 49);
-
-                if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-background' ) {
-                        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 ( $this->admin_header_callback )
@@ -106 +100 @@
                 );
 
-                add_thickbox();
                 wp_enqueue_media();
                 wp_enqueue_script('custom-background');
@@ -398 +391 @@
 
         /**
-         * Replace default attachment actions with "Set as background" link.
+         * Unused since 3.5.0.
          *
          * @since 3.4.0
          */
-        function attachment_fields_to_edit( $form_fields, $post ) {
-                $form_fields = array( 'image-size' => $form_fields['image-size'] );
-                $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-attachment-id="' . $post->ID . '" class="wp-set-background">' . __( 'Set as background' ) . '</a></td></tr>' );
-                $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-background' );
-
+        function attachment_fields_to_edit( $form_fields ) {
                 return $form_fields;
         }
 
         /**
-         * Leave only "Media Library" tab in the uploader window.
+         * Unused since 3.5.0.
          *
          * @since 3.4.0
          */
-        function filter_upload_tabs() {
-                return array( 'library' => __('Media Library') );
+        function filter_upload_tabs( $tabs ) {
+                return $tabs;
         }
 

trunk/wp-admin/custom-header.php

@@ -94 +94 @@
                 if ( $this->admin_header_callback )
                         add_action("admin_head-$page", $this->admin_header_callback, 51);
-
-                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' );
-                }
         }
 
@@ -172 +166 @@
 
                 if ( ( 1 == $step || 3 == $step ) ) {
-                        add_thickbox();
                         wp_enqueue_media();
                         wp_enqueue_script( 'custom-header' );
@@ -911 +904 @@
 
         /**
-         * Replace default attachment actions with "Set as header" link.
+         * Unused since 3.5.0.
          *
          * @since 3.4.0
          */
-        function attachment_fields_to_edit( $form_fields, $post ) {
-                $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' );
-
+        function attachment_fields_to_edit( $form_fields ) {
                 return $form_fields;
         }
 
         /**
-         * Leave only "Media Library" tab in the uploader window.
+         * Unused since 3.5.0.
          *
          * @since 3.4.0
          */
-        function filter_upload_tabs() {
-                return array( 'library' => __('Media Library') );
+        function filter_upload_tabs( $tabs ) {
+                return $tabs;
         }