X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..e9d988989fe37ab8c5f903e47fbe36e6e00dc51f:/wp-admin/includes/meta-boxes.php?ds=sidebyside
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 0f8b339b..a84ac16f 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -22,7 +22,7 @@ function post_submit_meta_box($post) {
-
+
post_status ) {
- $preview_link = esc_url(get_permalink($post->ID));
- $preview_button = __('Preview Changes');
+ $preview_link = esc_url( get_permalink( $post->ID ) );
+ $preview_button = __( 'Preview Changes' );
} else {
- $preview_link = esc_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID))));
- $preview_button = __('Preview');
+ $preview_link = get_permalink( $post->ID );
+ if ( is_ssl() )
+ $preview_link = str_replace( 'http://', 'https://', $preview_link );
+ $preview_link = esc_url( apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ) ) );
+ $preview_button = __( 'Preview' );
}
?>
@@ -73,9 +77,6 @@ switch ( $post->post_status ) {
case 'auto-draft':
_e('Draft');
break;
- case 'auto-draft':
- _e('Unsaved');
- break;
}
?>
@@ -153,7 +154,6 @@ echo esc_html( $visibility_trans ); ?>
-
ID ) ) {
-
+
post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
if ( $can_publish ) :
if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
-
+ '5', 'accesskey' => 'p' ) ); ?>
-
+ '5', 'accesskey' => 'p' ) ); ?>
-
+ '5', 'accesskey' => 'p' ) ); ?>
@@ -233,6 +233,35 @@ if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0
post_type, 'post-formats' ) ) :
+ $post_formats = get_theme_support( 'post-formats' );
+
+ if ( is_array( $post_formats[0] ) ) :
+ $post_format = get_post_format( $post->ID );
+ if ( !$post_format )
+ $post_format = '0';
+ $post_format_display = get_post_format_string( $post_format );
+ // Add in the current one if it isn't there yet, in case the current theme doesn't support it
+ if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
+ $post_formats[0][] = $post_format;
+ ?>
+
+ />
+
+
/>
+
+
+
+
cap->assign_terms) ) : ?>
@@ -271,8 +300,6 @@ function post_tags_meta_box($post, $box) {
cap->assign_terms) ) : ?>
labels->choose_from_most_used; ?>
-
-
ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
- cap->assign_terms) ) : ?>
-
-
cap->edit_terms) ) : ?>
@@ -356,7 +380,7 @@ function post_categories_meta_box( $post, $box ) {
*/
function post_excerpt_meta_box($post) {
?>
-
+
Learn more about manual excerpts.'); ?>
+
-
+ $wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
+ $wp_list_table->display( true );
+?>
jQuery(document).ready(function(){commentsBox.get(, 10);});
id, true, $post->post_type ); // TODO: ROLE SYSTEM
- if ( $post->post_author && !in_array($post->post_author, $authors) )
- $authors[] = $post->post_author;
+ global $user_ID;
?>
-
$authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+
'authors',
+ 'name' => 'post_author_override',
+ 'selected' => empty($post->ID) ? $user_ID : $post->post_author,
+ 'include_selected' => true
+ ) );
}
@@ -578,7 +600,7 @@ function link_submit_meta_box($link) {
-
+
@@ -862,7 +884,7 @@ function link_advanced_meta_box($link) {
|
- |
+ |
|