IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First pass at removing Post Format UI.

Browse Source 
see #24452. fixes #24455.

git-svn-id: http://core.svn.wordpress.org/trunk@24388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith
2013-05-30 21:33:46 +00:00
parent c5530f9fc6
commit 89fd06e44b
11 changed files with 9 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/includes/ajax-actions.php
View File

@@ -1126,23 +1126,6 @@ function wp_ajax_closed_postboxes() {
wp_die( 1 );
}
function wp_ajax_show_post_format_ui() {
if ( empty( $_POST['post_type'] ) )
wp_die( 0 );
check_ajax_referer( 'show-post-format-ui_' . $_POST['post_type'], 'nonce' );
if ( ! $post_type_object = get_post_type_object( $_POST['post_type'] ) )
wp_die( 0 );
if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
wp_die( -1 );
update_user_option( get_current_user_id(), 'post_formats_' . $post_type_object->name, empty( $_POST['show'] ) ? 0 : 1 );
wp_die( 1 );
}
function wp_ajax_hidden_columns() {
check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
$hidden = isset( $_POST['hidden'] ) ? $_POST['hidden'] : '';

163
wp-admin/includes/post-formats.php
View File

@@ -1,163 +0,0 @@
<?php
/**
* Structured data fields for the Post Formats UI
*
* @package WordPress
* @subpackage Administration
*/
defined( 'ABSPATH' ) or die;
global $wp_embed;
$format_meta = get_post_format_meta( $post_ID );
wp_nonce_field( 'show-post-format-ui_' . $post_type, 'show_post_format_ui_nonce', false );
?>
<div class="wp-post-format-ui">
<div class="post-formats-fields">
<input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
<div class="field wp-format-quote">
<label for="wp_format_quote_source"><?php _e( 'Quote source' ); ?></label>
<input type="text" id="wp_format_quote_source" name="_format_quote_source_name" value="<?php echo esc_attr( $format_meta['quote_source_name'] ); ?>" class="widefat" />
</div>
<div class="field wp-format-image">
<?php if ( ! empty( $format_meta['image'] ) ) :
$value = $format_meta['image'];
?>
<div id="image-preview" class="wp-format-media-preview">
<?php
if ( is_numeric( $value ) ) {
$image = wp_get_attachment_url( $value );
printf( '<img src="%s" alt="%s" />', esc_url( $image ), get_the_title( $value ) );
} elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) {
echo do_shortcode( $value );
} elseif ( ! preg_match( '#<[^>]+>#', $value ) ) {
printf( '<img src="%s" alt="" />', esc_url( $value ) );
} else {
echo $value;
}
?>
</div>
<?php endif ?>
<div data-format="image" class="wp-format-media-holder hide-if-no-js">
<div><h3><?php _e( 'Drop image file to upload' ); ?></h3></div>
<a href="#" class="wp-format-media-select"
data-choose="<?php esc_attr_e( 'Choose an Image' ); ?>"
data-update="<?php esc_attr_e( 'Select Image' ); ?>">
<?php _e( 'Select / Upload Image' ); ?>
</a>
</div>
<div class="wp-format-image-textarea hide-if-js">
<label for="wp_format_image"><?php
if ( current_user_can( 'unfiltered_html' ) )
_e( 'Image URL or HTML' );
else
_e( 'Image URL' );
?></label>
<textarea id="wp_format_image" type="text" name="_format_image" class="widefat"><?php echo esc_textarea( $format_meta['image'] ); ?></textarea>
</div>
<p class="use-url-or-html hide-if-no-js">
<span><?php
if ( current_user_can( 'unfiltered_html' ) )
_e( '(or <a href="#">use an image URL or HTML</a>)' );
else
_e( '(or <a href="#">use an image URL</a>)' );
?></span>
<span style="display: none"><?php _e( '(or <a href="#">select/upload an image</a>)' ); ?></span></p>
</div>
<div class="field wp-format-link">
<label for="wp_format_link_url"><?php _e( 'Link URL' ); ?></label>
<input type="text" id="wp_format_link_url" name="_format_link_url" value="<?php echo esc_url( $format_meta['link_url'] ); ?>" class="widefat code" />
</div>
<div class="field wp-format-quote">
<label for="wp_format_quote_source_url"><?php _e( 'Quote source link' ); ?></label>
<input type="text" id="wp_format_quote_source_url" name="_format_quote_source_url" value="<?php echo esc_url( $format_meta['quote_source_url'] ); ?>" class="widefat code" />
</div>
<div class="field wp-format-image">
<label for="wp_format_image_url"><?php _e( 'Image click-through link' ); ?></label>
<input type="text" id="wp_format_image_url" name="_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat code" />
</div>
<div class="field wp-format-video">
<?php if ( ! empty( $format_meta['video_embed'] ) ):
$value = $format_meta['video_embed'];
?>
<div id="video-preview" class="wp-format-media-preview">
<?php
if ( is_numeric( $value ) ) {
$video = wp_get_attachment_url( $value );
echo do_shortcode( sprintf( '[video src="%s"]', $video ) );
} elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) {
echo do_shortcode( $value );
} elseif ( ! preg_match( '#<[^>]+>#', $value ) ) {
if ( strstr( $value, home_url() ) )
echo do_shortcode( sprintf( '[video src="%s"]', $value ) );
else
echo $wp_embed->autoembed( $value );
} else {
echo $value;
}
?>
</div>
<?php endif; ?>
<label for="wp_format_video"><?php
if ( current_user_can( 'unfiltered_html' ) )
_e( 'Video embed code or URL' );
else
_e( 'Video URL' );
?></label>
<textarea id="wp_format_video" type="text" name="_format_video_embed" class="widefat"><?php echo esc_textarea( $format_meta['video_embed'] ); ?></textarea>
<div data-format="video" class="wp-format-media-holder hide-if-no-js">
<a href="#" class="wp-format-media-select"
data-choose="<?php esc_attr_e( 'Choose a Video' ); ?>"
data-update="<?php esc_attr_e( 'Select Video' ); ?>">
<?php _e( 'Select Video From Media Library' ) ?>
</a>
</div>
</div>
<div class="field wp-format-audio">
<?php if ( ! empty( $format_meta['audio_embed'] ) ):
$value = $format_meta['audio_embed'];
?>
<div id="audio-preview" class="wp-format-media-preview">
<?php
if ( is_numeric( $value ) ) {
$audio = wp_get_attachment_url( $value );
echo do_shortcode( sprintf( '[audio src="%s"]', $audio ) );
} elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) {
echo do_shortcode( $value );
} elseif ( ! preg_match( '#<[^>]+>#', $value ) ) {
if ( strstr( $value, home_url() ) )
echo do_shortcode( sprintf( '[audio src="%s"]', $value ) );
else
echo $wp_embed->autoembed( $value );
} else {
echo $value;
}
?>
</div>
<?php endif; ?>
<label for="wp_format_audio"><?php
if ( current_user_can( 'unfiltered_html' ) )
_e( 'Audio embed code or URL' );
else
_e( 'Audio URL' );
?></label>
<textarea id="wp_format_audio" name="_format_audio_embed" class="widefat"><?php echo esc_textarea( $format_meta['audio_embed'] ); ?></textarea>
<div data-format="audio" class="wp-format-media-holder hide-if-no-js">
<a href="#" class="wp-format-media-select" data-choose="<?php esc_attr_e( 'Choose Audio' ); ?>" data-update="<?php esc_attr_e( 'Select Audio' ); ?>">
<?php _e( 'Select Audio From Media Library' ) ?>
</a>
</div>
</div>
</div>
</div>

20
wp-admin/includes/post.php
View File

@@ -1290,26 +1290,6 @@ function wp_create_post_autosave( $post_id ) {
$new_autosave['ID'] = $old_autosave->ID;
$new_autosave['post_author'] = $post_author;
// Auto-save revisioned meta fields.
foreach ( _wp_post_revision_meta_keys() as $meta_key ) {
if ( isset( $_POST[ $meta_key ] ) && get_post_meta( $new_autosave['ID'], $meta_key, true ) != $_POST[ $meta_key ] ) {
// Use the underlying delete_metadata and add_metadata vs delete_post_meta
// and add_post_meta to make sure we're working with the actual revision meta.
delete_metadata( 'post', $new_autosave['ID'], $meta_key );
if ( ! empty( $_POST[ $meta_key ] ) )
add_metadata( 'post', $new_autosave['ID'], $meta_key, $_POST[ $meta_key ] );
}
}
// Save the post format if different
if ( isset( $_POST['post_format'] ) && get_post_meta( $new_autosave['ID'], '_revision_post_format', true ) != $_POST['post_format'] ) {
delete_metadata( 'post', $new_autosave['ID'], '_revision_post_format' );
if ( ! empty( $_POST['post_format'] ) )
add_metadata( 'post', $new_autosave['ID'], '_revision_post_format', $_POST['post_format'] );
}
return wp_update_post( $new_autosave );
}

30
wp-admin/includes/screen.php
View File

@@ -963,36 +963,6 @@ final class WP_Screen {
echo '<label for="wp_welcome_panel-hide">';
echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
} elseif ( 'post' == $this->base && post_type_supports( $this->post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $post ) ) {
// If the user has explicitly set a screen option, use it, otherwise the UI is shown
// when the theme supports formats, or if the site has formats assigned to posts.
$post_format_user_option = get_user_option( 'post_formats_' . $post->post_type );
if ( false !== $post_format_user_option )
$show_post_format_ui = (bool) $post_format_user_option;
else
$show_post_format_ui = current_theme_supports( 'post-formats' ) || (bool) get_terms( 'post_format', array( 'number' => 1 ) );
if ( ! $show_post_format_ui && 'auto-draft' != $post->post_status ) {
$meta = get_post_format_meta( $post->ID );
$format_meta_keys = array(
'link' => array( 'linkurl' ),
'image' => array( 'url', 'image' ),
'quote' => array( 'quote_source_name', 'quote_source_url' ),
'video' => array( 'video_embed' ),
'audio' => array( 'audio_embed' ),
);
// If there's any structured post format data, enforce the UI display.
$format_meta_keys = isset( $format_meta_keys[ get_post_format() ] ) ? $format_meta_keys[ get_post_format() ] : array();
foreach ( $format_meta_keys as $key )
if ( ! empty( $meta[ $key ] ) )
$show_post_format_ui = true;
}
echo '<label for="show_post_format_ui">';
echo '<input type="checkbox" id="show_post_format_ui"' . checked( $show_post_format_ui, true, false ) . ' />';
echo __( 'Post Formats' ) . "</label>\n";
}
?>
<br class="clear" />