WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://core.svn.wordpress.org/trunk@21009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-06-06 16:48:53 +00:00
parent 6e030d2ed4
commit 23104564f0
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-admin/custom-background.php
View File

@ -72,8 +72,12 @@ class Custom_Background {
add_action("load-$page", array(&$this, 'admin_load')); add_action("load-$page", array(&$this, 'admin_load'));
add_action("load-$page", array(&$this, 'take_action'), 49); add_action("load-$page", array(&$this, 'take_action'), 49);
add_action("load-$page", array(&$this, 'handle_upload'), 49); add_action("load-$page", array(&$this, 'handle_upload'), 49);
add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) ); 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 ) if ( $this->admin_header_callback )
add_action("admin_head-$page", $this->admin_header_callback, 51); add_action("admin_head-$page", $this->admin_header_callback, 51);
@ -388,21 +392,26 @@ if ( get_background_image() ) {
$this->updated = true; $this->updated = true;
} }
/**
* Replace default attachment actions with "Set as background" link.
*
* @since 3.4.0
*/
function attachment_fields_to_edit( $form_fields, $post ) { function attachment_fields_to_edit( $form_fields, $post ) {
if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-background' ) { $form_fields = array( 'image-size' => $form_fields['image-size'] );
$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['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' );
$form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-background' );
}
return $form_fields; return $form_fields;
} }
function filter_upload_tabs ( $tabs ){ /**
if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-background' ) * Leave only "Media Library" tab in the uploader window.
return array( 'library' => __('Media Library') ); *
* @since 3.4.0
return $tabs; */
function filter_upload_tabs() {
return array( 'library' => __('Media Library') );
} }
public function wp_set_background_image() { public function wp_set_background_image() {

35
wp-admin/custom-header.php
View File

@ -94,9 +94,11 @@ class Custom_Image_Header {
if ( $this->admin_header_callback ) if ( $this->admin_header_callback )
add_action("admin_head-$page", $this->admin_header_callback, 51); add_action("admin_head-$page", $this->admin_header_callback, 51);
add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 ); if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) {
add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) ); add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
add_filter( 'media_upload_mime_type_links', '__return_empty_array' ); add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
}
} }
/** /**
@ -972,18 +974,16 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
* @since 3.4.0 * @since 3.4.0
*/ */
function attachment_fields_to_edit( $form_fields, $post ) { function attachment_fields_to_edit( $form_fields, $post ) {
if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) { $form_fields = array();
$form_fields = array(); $href = esc_url(add_query_arg(array(
$href = esc_url(add_query_arg(array( 'page' => 'custom-header',
'page' => 'custom-header', 'step' => 2,
'step' => 2, '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
'_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'), 'file' => $post->ID
'file' => $post->ID ), admin_url('themes.php')));
), 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['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['context'] = array( 'input' => 'hidden', 'value' => 'custom-header' );
}
return $form_fields; return $form_fields;
} }
@ -993,11 +993,8 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
* *
* @since 3.4.0 * @since 3.4.0
*/ */
function filter_upload_tabs( $tabs ) { function filter_upload_tabs() {
if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) return array( 'library' => __('Media Library') );
return array( 'library' => __('Media Library') );
return $tabs;
} }
} }