<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24092] trunk: Screen option for Post Format UI.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24092">24092</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-25 07:28:33 +0000 (Thu, 25 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Screen option for Post Format UI.
props nacin. see <a href="http://core.trac.wordpress.org/ticket/23930">#23930</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminincludespostformatsphp">trunk/wp-admin/includes/post-formats.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/admin-ajax.php 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> 'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
</span><span class="cx"> 'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
</span><span class="cx"> 'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
</span><del>- 'send-attachment-to-editor', 'save-attachment-order', 'heartbeat'
</del><ins>+ 'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'show-post-format-ui',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register core Ajax calls.
</span></span></pre></div>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/css/wp-admin.css 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -3938,6 +3938,10 @@
</span><span class="cx"> padding-bottom: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.no-ui {
+ display: none;
+}
+
</ins><span class="cx"> .post-formats-fields {
</span><span class="cx"> display: none;
</span><span class="cx"> margin-bottom: 15px;
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/edit-form-advanced.php 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -146,6 +146,15 @@
</span><span class="cx"> $post_format_set_class = '';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $user_wants = get_user_option( 'post_formats_' . $post_type );
+ if ( false !== $user_wants ) {
+ // User wants what user gets.
+ $show_post_format_ui = (bool) $user_wants;
+ } else {
+ // UI is shown when the theme supports formats, or if the site has formats assigned to posts.
+ $show_post_format_ui = current_theme_supports( 'post-formats' ) || get_terms( 'post_format', array( 'number' => 1 ) );
+ }
+
</ins><span class="cx"> $format_class = " class='wp-format-{$post_format}'";
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -383,8 +392,10 @@
</span><span class="cx"> <p><?php _e("You have lost your connection with the server, and saving has been disabled. This message will vanish once you've reconnected."); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <?php if ( ! empty( $post_format_options ) ) : ?>
</span><del>-<div class="post-format-options">
- <?php echo $post_format_options; ?>
</del><ins>+<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+ <div class="post-format-options">
+ <?php echo $post_format_options; ?>
+ </div>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag'); ?>>
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -1135,6 +1135,25 @@
</span><span class="cx"> wp_die( 1 );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function wp_ajax_show_post_format_ui() {
+ error_log( serialize( $_REQUEST ) );
+
+ 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 );
+}
+
</ins><span class="cx"> function wp_ajax_hidden_columns() {
</span><span class="cx"> check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
</span><span class="cx"> $hidden = isset( $_POST['hidden'] ) ? $_POST['hidden'] : '';
</span></span></pre></div>
<a id="trunkwpadminincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post-formats.php (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post-formats.php 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/includes/post-formats.php 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -1,140 +1,147 @@
</span><span class="cx"> <?php
</span><ins>+
+defined( 'ABSPATH' ) or die;
+
</ins><span class="cx"> global $wp_embed;
</span><span class="cx">
</span><span class="cx"> $format_meta = get_post_format_meta( $post_ID );
</span><span class="cx">
</span><ins>+wp_nonce_field( 'show-post-format-ui_' . $post_type, 'show_post_format_ui_nonce', false );
+
</ins><span class="cx"> ?>
</span><del>-<div class="post-format-change"><span class="icon <?php echo esc_attr( $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span> <a href="#"><?php _e('Change format'); ?></a></div>
-<div class="post-formats-fields">
</del><ins>+<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+ <div class="post-format-change"><span class="icon <?php echo esc_attr( $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span> <a href="#"><?php _e('Change format'); ?></a></div>
+ <div class="post-formats-fields">
</ins><span class="cx">
</span><del>- <input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
</del><ins>+ <input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
</ins><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><del>- <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;
- }
</del><ins>+ <div class="field wp-format-image">
+ <?php if ( ! empty( $format_meta['image'] ) ) :
+ $value = $format_meta['image'];
</ins><span class="cx"> ?>
</span><ins>+ <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 ?>
+ <label for="wp_format_image"><?php
+ if ( current_user_can( 'unfiltered_html' ) )
+ _e( 'Image HTML or URL' );
+ else
+ _e( 'Image URL' );
+ ?></label>
+ <textarea id="wp_format_image" type="text" name="_format_image" class="widefat"><?php esc_html_e( $format_meta['image'] ); ?></textarea>
+ <div data-format="image" class="wp-format-media-holder hide-if-no-js">
+ <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>
</ins><span class="cx"> </div>
</span><del>- <?php endif ?>
- <label for="wp_format_image"><?php
- if ( current_user_can( 'unfiltered_html' ) )
- _e( 'Image HTML or URL' );
- else
- _e( 'Image URL' );
- ?></label>
- <textarea id="wp_format_image" type="text" name="_format_image" class="widefat"><?php esc_html_e( $format_meta['image'] ); ?></textarea>
- <div data-format="image" class="wp-format-media-holder hide-if-no-js">
- <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>
</del><ins>+
+ <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" />
</ins><span class="cx"> </div>
</span><del>- </div>
</del><span class="cx">
</span><del>- <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" />
- </div>
</del><ins>+ <div class="field wp-format-quote">
+ <label for="wp_format_quote_source_url"><?php _e( 'Link URL' ); ?></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" />
+ </div>
</ins><span class="cx">
</span><del>- <div class="field wp-format-quote">
- <label for="wp_format_quote_source_url"><?php _e( 'Link URL' ); ?></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" />
- </div>
</del><ins>+ <div class="field wp-format-image">
+ <label for="wp_format_image_url"><?php _e( 'Link URL' ); ?></label>
+ <input type="text" id="wp_format_image_url" name="_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat" />
+ </div>
</ins><span class="cx">
</span><del>- <div class="field wp-format-image">
- <label for="wp_format_image_url"><?php _e( 'Link URL' ); ?></label>
- <input type="text" id="wp_format_image_url" name="_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat" />
- </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;
- }
</del><ins>+ <div class="field wp-format-video">
+ <?php if ( ! empty( $format_meta['video_embed'] ) ):
+ $value = $format_meta['video_embed'];
</ins><span class="cx"> ?>
</span><ins>+ <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 esc_html_e( $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>
</ins><span class="cx"> </div>
</span><del>- <?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 esc_html_e( $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>
</del><span class="cx">
</span><del>- <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;
- }
</del><ins>+ <div class="field wp-format-audio">
+ <?php if ( ! empty( $format_meta['audio_embed'] ) ):
+ $value = $format_meta['audio_embed'];
</ins><span class="cx"> ?>
</span><ins>+ <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 esc_html_e( $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>
</ins><span class="cx"> </div>
</span><del>- <?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 esc_html_e( $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>
</del><span class="cx"> </div>
</span><del>-</div>
</del><ins>+</div>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/includes/screen.php 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -962,6 +962,18 @@
</span><span class="cx"> echo '<label for="wp_welcome_panel-hide">';
</span><span class="cx"> echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
</span><span class="cx"> echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
</span><ins>+ } elseif ( 'post' == $this->base && post_type_supports( $this->post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $GLOBALS['post'] ) ) {
+ $user_wants = get_user_option( 'post_formats_' . $this->post_type );
+ if ( false !== $user_wants ) {
+ // User wants what user gets.
+ $show_post_format_ui = (bool) $user_wants;
+ } else {
+ // UI is shown when the theme supports formats, or if the site has formats assigned to posts.
+ $show_post_format_ui = current_theme_supports( 'post-formats' ) || get_terms( 'post_format', array( 'number' => 1 ) );
+ }
+ 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";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.js (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-admin/js/post-formats.js 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -109,6 +109,16 @@
</span><span class="cx"> resizeContent( initialFormat, true );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $('#show_post_format_ui').on('change', function() {
+ $('.wp-post-format-ui').toggleClass('no-ui', ! this.checked );
+ $.post( ajaxurl, {
+ action: 'show-post-format-ui',
+ post_type: $('#post_type').val(),
+ show: this.checked ? 1 : 0,
+ nonce: $('#show_post_format_ui_nonce').val()
+ });
+ });
+
</ins><span class="cx"> $('.post-format-change a').click(function() {
</span><span class="cx"> $('.post-formats-fields, .post-format-change').slideUp();
</span><span class="cx"> $('.post-format-options').slideDown();
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (24091 => 24092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2013-04-25 07:10:35 UTC (rev 24091)
+++ trunk/wp-includes/user.php 2013-04-25 07:28:33 UTC (rev 24092)
</span><span class="lines">@@ -276,11 +276,6 @@
</span><span class="cx"> if ( !$global )
</span><span class="cx"> $option_name = $wpdb->prefix . $option_name;
</span><span class="cx">
</span><del>- // For backward compatibility. See differences between update_user_meta() and deprecated update_usermeta().
- // http://core.trac.wordpress.org/ticket/13088
- if ( is_null( $newvalue ) || is_scalar( $newvalue ) && empty( $newvalue ) )
- return delete_user_meta( $user_id, $option_name );
-
</del><span class="cx"> return update_user_meta( $user_id, $option_name, $newvalue );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>