-
-
+
+
-
-
-
'post',
- 'post_status' => 'draft',
- 'author' => $GLOBALS['current_user']->ID,
- 'posts_per_page' => 5,
- 'orderby' => 'modified',
- 'order' => 'DESC'
- ) );
- $drafts =& $drafts_query->posts;
- }
+/**
+ * Show `Recent Drafts` below Quick Draft form
+ *
+ *
+ *
+ * @since 3.8.0
+ *
+ */
+function wp_dashboard_recent_quickdrafts() {
+
+ $query_args = array(
+ 'post_type' => 'post',
+ 'post_status' => 'draft',
+ 'author' => $GLOBALS['current_user']->ID,
+ 'posts_per_page' => 4,
+ 'orderby' => 'modified',
+ 'order' => 'DESC'
+ );
+ $query_args = apply_filters( 'dash_recent_quickdrafts_query_args', $query_args );
+ $drafts_query = new WP_Query( $query_args );
+ $drafts =& $drafts_query->posts;
+
if ( $drafts && is_array( $drafts ) ) {
$list = array();
+ $draft_count = 0;
foreach ( $drafts as $draft ) {
+ if ( 3 == $draft_count )
+ break;
+
+ $draft_count++;
+
$url = get_edit_post_link( $draft->ID );
$title = _draft_or_post_title( $draft->ID );
- $item = "
" . esc_html($title) . " " . get_the_time( get_option( 'date_format' ), $draft ) . ' ';
+ $item = '
';
if ( $the_content = wp_trim_words( $draft->post_content, 10 ) )
$item .= '
' . $the_content . '
';
$list[] = $item;
}
+
+ do_action( 'dashboard_quickdraft_drafts_list', $drafts );
?>
-
-
- $total_items * 5, 'offset' => 0 );
- if ( ! current_user_can( 'edit_posts' ) )
- $comments_query['status'] = 'approve';
-
- while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
- foreach ( $possible as $comment ) {
- if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
- continue;
- $comments[] = $comment;
- if ( count( $comments ) == $total_items )
- break 2;
- }
- $comments_query['offset'] += $comments_query['number'];
- $comments_query['number'] = $total_items * 10;
- }
-
- if ( $comments ) {
- echo '';
-
- if ( current_user_can('edit_posts') )
- _get_list_table('WP_Comments_List_Table')->views();
-
- wp_comment_reply( -1, false, 'dashboard', false );
- wp_comment_trashnotice();
- } else {
- echo '
' . __( 'No comments yet.' ) . '
';
- }
+
+';
- if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-recent-comments']) ) {
- $number = absint( $_POST['widget-recent-comments']['items'] );
- $widget_options['dashboard_recent_comments']['items'] = $number;
- update_option( 'dashboard_widget_options', $widget_options );
- }
+ do_action( 'dashboard_activity_beginning' );
- $number = isset( $widget_options['dashboard_recent_comments']['items'] ) ? (int) $widget_options['dashboard_recent_comments']['items'] : '';
-
- echo '
' . __('Number of comments to show:') . ' ';
- echo '
';
-}
-
-function wp_dashboard_incoming_links() {
- wp_dashboard_cached_rss_widget( 'dashboard_incoming_links', 'wp_dashboard_incoming_links_output' );
-}
-
-/**
- * Display incoming links dashboard widget content.
- *
- * @since 2.5.0
- */
-function wp_dashboard_incoming_links_output() {
- $widgets = get_option( 'dashboard_widget_options' );
- @extract( @$widgets['dashboard_incoming_links'], EXTR_SKIP );
- $rss = fetch_feed( $url );
-
- if ( is_wp_error($rss) ) {
- if ( is_admin() || current_user_can('manage_options') ) {
- echo '
';
- printf(__('RSS Error : %s'), $rss->get_error_message());
- echo '
';
- }
- return;
- }
-
- if ( !$rss->get_item_quantity() ) {
- echo '
' . __('This dashboard widget queries Google Blog Search so that when another blog links to your site it will show up here. It has found no incoming links… yet. It’s okay — there is no rush.') . "
\n";
- $rss->__destruct();
- unset($rss);
- return;
- }
-
- echo "
\n";
-
- if ( !isset($items) )
- $items = 10;
-
- foreach ( $rss->get_items(0, $items) as $item ) {
- $publisher = '';
- $site_link = '';
- $link = '';
- $content = '';
- $date = '';
- $link = esc_url( strip_tags( $item->get_link() ) );
-
- $author = $item->get_author();
- if ( $author ) {
- $site_link = esc_url( strip_tags( $author->get_link() ) );
-
- if ( !$publisher = esc_html( strip_tags( $author->get_name() ) ) )
- $publisher = __( 'Somebody' );
- } else {
- $publisher = __( 'Somebody' );
- }
- if ( $site_link )
- $publisher = "$publisher ";
- else
- $publisher = "$publisher ";
-
- $content = $item->get_content();
- $content = wp_html_excerpt( $content, 50, ' …' );
-
- if ( $link )
- /* translators: incoming links feed, %1$s is other person, %3$s is content */
- $text = __( '%1$s linked here saying , "%3$s"' );
- else
- /* translators: incoming links feed, %1$s is other person, %3$s is content */
- $text = __( '%1$s linked here saying, "%3$s"' );
-
- if ( !empty( $show_date ) ) {
- if ( $link )
- /* translators: incoming links feed, %1$s is other person, %3$s is content, %4$s is the date */
- $text = __( '%1$s linked here saying , "%3$s" on %4$s' );
- else
- /* translators: incoming links feed, %1$s is other person, %3$s is content, %4$s is the date */
- $text = __( '%1$s linked here saying, "%3$s" on %4$s' );
- $date = esc_html( strip_tags( $item->get_date() ) );
- $date = strtotime( $date );
- $date = gmdate( get_option( 'date_format' ), $date );
- }
-
- echo "\t" . sprintf( $text, $publisher, $link, $content, $date ) . " \n";
- }
-
- echo " \n";
- $rss->__destruct();
- unset($rss);
-}
-
-function wp_dashboard_incoming_links_control() {
- wp_dashboard_rss_control( 'dashboard_incoming_links', array( 'title' => false, 'show_summary' => false, 'show_author' => false ) );
-}
-
-function wp_dashboard_primary() {
- wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' );
-}
-
-function wp_dashboard_primary_control() {
- wp_dashboard_rss_control( 'dashboard_primary' );
-}
-
-/**
- * Display primary dashboard RSS widget feed.
- *
- * @since 2.5.0
- *
- * @param string $widget_id
- */
-function wp_dashboard_rss_output( $widget_id ) {
- $widgets = get_option( 'dashboard_widget_options' );
- echo '";
-}
-
-function wp_dashboard_secondary() {
- wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' );
-}
-
-function wp_dashboard_secondary_control() {
- wp_dashboard_rss_control( 'dashboard_secondary' );
-}
-
-/**
- * Display secondary dashboard RSS widget feed.
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function wp_dashboard_secondary_output() {
- $widgets = get_option( 'dashboard_widget_options' );
- @extract( @$widgets['dashboard_secondary'], EXTR_SKIP );
- $rss = @fetch_feed( $url );
-
- if ( is_wp_error($rss) ) {
- if ( is_admin() || current_user_can('manage_options') ) {
- echo '';
- }
- } elseif ( !$rss->get_item_quantity() ) {
- $rss->__destruct();
- unset($rss);
- return false;
- } else {
- echo '';
- $rss->__destruct();
- unset($rss);
- }
-}
-
-function wp_dashboard_plugins() {
- wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array(
- 'http://wordpress.org/plugins/rss/browse/popular/',
- 'http://wordpress.org/plugins/rss/browse/new/'
+ $future_posts = dashboard_show_published_posts( array(
+ 'display' => 2,
+ 'max' => 5,
+ 'status' => 'future',
+ 'order' => 'ASC',
+ 'title' => __( 'Publishing Soon' ),
+ 'id' => 'future-posts',
) );
+ $recent_posts = dashboard_show_published_posts( array(
+ 'display' => 2,
+ 'max' => 5,
+ 'status' => 'publish',
+ 'order' => 'DESC',
+ 'title' => __( 'Recently Published' ),
+ 'id' => 'published-posts',
+ ) );
+
+ do_action( 'dashboard_activity_middle' );
+
+ $recent_comments = dashboard_comments();
+
+ if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+ echo '
';
+ echo '
';
+ echo '
' . __( 'No activity yet!' ) . '
';
+ echo '
';
+ }
+
+ do_action( 'dashboard_activity_end' );
+
+ echo '
-
-
- %2$sMB' ), esc_url( admin_url( 'upload.php' ) ), number_format_i18n( $quota ) ); ?>
-
-
+
+
+
+
+ %2$sMB %4$s',
+ esc_url( admin_url( 'upload.php' ) ),
+ number_format_i18n( $quota ),
+ __( 'Manage Uploads' ),
+ __( 'Space Allowed' )
+ ); ?>
+
+ %2$sMB (%3$s%%) %5$s',
+ esc_url( admin_url( 'upload.php' ) ),
+ number_format_i18n( $used, 2 ),
+ $percentused,
+ __( 'Manage Uploads' ),
+ __( 'Space Used' )
+ ); ?>
+
+
-
-
4, 'default' => 1) );
-else
- add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
-
$help = '
' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '
';
// Not using chaining here, so as to be parseable by PHP4.
@@ -47,47 +42,42 @@ $screen->add_help_tab( array(
// Help tabs
-$help = '
' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '
';
-$help .= '
' . __('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '
';
+$help = '
' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '
';
+$help .= '
' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '
';
$screen->add_help_tab( array(
'id' => 'help-navigation',
- 'title' => __('Navigation'),
+ 'title' => __( 'Navigation' ),
'content' => $help,
) );
-$help = '
' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '
';
-$help .= '
' . __('Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '
';
-$help .= '
' . __('Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '
';
-$help .= '
' . __('Box Controls - Click the title bar of the box to expand or collapse it. In addition, some boxes have configurable content, and will show a “Configure” link in the title bar if you hover over it.') . '
';
+$help = '
' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '
';
+$help .= '
' . __( 'Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '
';
+$help .= '
' . __( 'Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '
';
+$help .= '
' . __( 'Box Controls - Click the title bar of the box to expand or collapse it. In addition, some boxes have configurable content, and will show a “Configure” link in the title bar if you hover over it.' ) . '
';
$screen->add_help_tab( array(
'id' => 'help-layout',
- 'title' => __('Layout'),
+ 'title' => __( 'Layout' ),
'content' => $help,
) );
-$help = '
' . __('The boxes on your Dashboard screen are:') . '
';
+$help = '
' . __( 'The boxes on your Dashboard screen are:' ) . '
';
if ( current_user_can( 'edit_posts' ) )
- $help .= '
' . __('Right Now - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '
';
-if ( current_user_can( 'moderate_comments' ) )
- $help .= '
' . __('Recent Comments - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '
';
-if ( current_user_can( 'publish_posts' ) )
- $help .= '
' . __('Incoming Links - Shows links to your site found by Google Blog Search.') . '
';
-if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
- $help .= '
' . __('QuickPress - Allows you to create a new post and either publish it or save it as a draft.') . '
';
- $help .= '
' . __('Recent Drafts - Displays links to the 5 most recent draft posts you’ve started.') . '
';
-}
-$help .= '
' . __('WordPress Blog - Latest news from the official WordPress project.') . '
';
-$help .= '
' . __('Other WordPress News - Shows the WordPress Planet feed. You can configure it to show a different feed of your choosing.') . '
';
+ $help .= '
' . __( 'Site Content - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '
';
+$help .= '
' . __( 'Activity - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '
';
+if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+ $help .= '
' . __( "Quick Draft - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '
';
if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
- $help .= '
' . __('Plugins - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '
';
+ $help .= '
' . __( 'WordPress News - Latest news from the official WordPress project, the WordPress Planet , and popular and recent plugins.' ) . '
';
+else
+ $help .= '
' . __( 'WordPress News - Latest news from the official WordPress project, the WordPress Planet .' ) . '
';
if ( current_user_can( 'edit_theme_options' ) )
- $help .= '
' . __('Welcome - Shows links for some of the most common tasks when setting up a new site.') . '
';
+ $help .= '
' . __( 'Welcome - Shows links for some of the most common tasks when setting up a new site.' ) . '
';
$screen->add_help_tab( array(
'id' => 'help-content',
- 'title' => __('Content'),
+ 'title' => __( 'Content' ),
'content' => $help,
) );
@@ -99,16 +89,16 @@ $screen->set_help_sidebar(
'
' . __( 'Support Forums ' ) . '
'
);
-include (ABSPATH . 'wp-admin/admin-header.php');
+include ( ABSPATH . 'wp-admin/admin-header.php' );
-$today = current_time('mysql', 1);
+$today = current_time( 'mysql', 1 );
?>
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/wp-admin/js/dashboard.js b/wp-admin/js/dashboard.js
index 50a17f85eb..34e6dad229 100644
--- a/wp-admin/js/dashboard.js
+++ b/wp-admin/js/dashboard.js
@@ -29,10 +29,7 @@ jQuery(document).ready( function($) {
// These widgets are sometimes populated via ajax
ajaxWidgets = [
- 'dashboard_incoming_links',
- 'dashboard_primary',
- 'dashboard_secondary',
- 'dashboard_plugins'
+ 'dashboard_rss'
];
ajaxPopulateWidgets = function(el) {
@@ -66,28 +63,32 @@ jQuery(document).ready( function($) {
quickPressLoad = function() {
var act = $('#quickpost-action'), t;
t = $('#quick-press').submit( function() {
- $('#dashboard_quick_press #publishing-action .spinner').show();
+ $('#dashboard_quick_draft #publishing-action .spinner').show();
$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', true);
- if ( 'post' == act.val() ) {
- act.val( 'post-quickpress-publish' );
+ $.post( t.attr( 'action' ), t.serializeArray(), function( data ) {
+ // Replace the form, and prepend the published post.
+ $('#dashboard_quick_draft .inside').html( data );
+ $('#quick-press').removeClass('initial-form');
+ quickPressLoad();
+ highlightLatestPost();
+ $('#title').focus();
+ });
+
+ function highlightLatestPost () {
+ var latestPost = $('#draft-list li').first();
+ latestPost.css('background', '#fffbe5');
+ setTimeout(function () {
+ latestPost.css('background', 'none');
+ }, 1000);
}
- $('#dashboard_quick_press div.inside').load( t.attr( 'action' ), t.serializeArray(), function() {
- $('#dashboard_quick_press #publishing-action .spinner').hide();
- $('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', false);
- $('#dashboard_quick_press ul').next('p').remove();
- $('#dashboard_quick_press ul').find('li').each( function() {
- $('#dashboard_recent_drafts ul').prepend( this );
- } ).end().remove();
- quickPressLoad();
- } );
return false;
} );
$('#publish').click( function() { act.val( 'post-quickpress-publish' ); } );
- $('#title, #tags-input').each( function() {
+ $('#title, #tags-input, #content').each( function() {
var input = $(this), prompt = $('#' + this.id + '-prompt-text');
if ( '' === this.value )
@@ -109,9 +110,39 @@ jQuery(document).ready( function($) {
});
$('#quick-press').on( 'click focusin', function() {
+ $(this).addClass("quickpress-open");
+ $("#description-wrap, p.submit").slideDown(200);
wpActiveEditor = 'content';
});
};
quickPressLoad();
+ // Activity Widget
+ $( '.show-more a' ).on( 'click', function(e) {
+ $( this ).fadeOut().closest('.activity-block').find( 'li.hidden' ).fadeIn().removeClass( 'hidden' );
+ e.preventDefault();
+ })
+
+ // Dashboard columns
+ jQuery(document).ready(function ($) {
+ // Update main column count on load
+ updateColumnCount();
+ });
+
+ jQuery(window).resize( _.debounce( function(){
+ updateColumnCount();
+ }, 30) );
+
+ function updateColumnCount() {
+ var cols = 1,
+ windowWidth = parseInt(jQuery(window).width());
+ if (799 < windowWidth && 1299 > windowWidth)
+ cols = 2;
+ if (1300 < windowWidth && 1799 > windowWidth)
+ cols = 3;
+ if (1800 < windowWidth)
+ cols = 4;
+ jQuery('.metabox-holder').attr('class', jQuery('.metabox-holder').attr('class').replace(/columns-\d+/, 'columns-' + cols));
+ }
+
} );
diff --git a/wp-admin/js/dashboard.min.js b/wp-admin/js/dashboard.min.js
index 38908044d1..1b8cee353b 100644
--- a/wp-admin/js/dashboard.min.js
+++ b/wp-admin/js/dashboard.min.js
@@ -1 +1 @@
-var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){var b=a("#welcome-panel"),c=a("#wp_welcome_panel-hide"),d=function(b){a.post(ajaxurl,{action:"update-welcome-panel",visible:b,welcomepanelnonce:a("#welcomepanelnonce").val()})};b.hasClass("hidden")&&c.prop("checked")&&b.removeClass("hidden"),a(".welcome-panel-close, .welcome-panel-dismiss a",b).click(function(c){c.preventDefault(),b.addClass("hidden"),d(0),a("#wp_welcome_panel-hide").prop("checked",!1)}),c.click(function(){b.toggleClass("hidden",!this.checked),d(this.checked?1:0)}),ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"],ajaxPopulateWidgets=function(b){function c(b,c){var d,e=a("#"+c+" div.inside:visible").find(".widget-loading");e.length&&(d=e.parent(),setTimeout(function(){d.load(ajaxurl+"?action=dashboard-widgets&widget="+c,"",function(){d.hide().slideDown("normal",function(){a(this).css("display","")})})},500*b))}b?(b=b.toString(),-1!=a.inArray(b,ajaxWidgets)&&c(0,b)):a.each(ajaxWidgets,c)},ajaxPopulateWidgets(),postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets}),quickPressLoad=function(){var b,c=a("#quickpost-action");b=a("#quick-press").submit(function(){return a("#dashboard_quick_press #publishing-action .spinner").show(),a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",!0),"post"==c.val()&&c.val("post-quickpress-publish"),a("#dashboard_quick_press div.inside").load(b.attr("action"),b.serializeArray(),function(){a("#dashboard_quick_press #publishing-action .spinner").hide(),a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",!1),a("#dashboard_quick_press ul").next("p").remove(),a("#dashboard_quick_press ul").find("li").each(function(){a("#dashboard_recent_drafts ul").prepend(this)}).end().remove(),quickPressLoad()}),!1}),a("#publish").click(function(){c.val("post-quickpress-publish")}),a("#title, #tags-input").each(function(){var b=a(this),c=a("#"+this.id+"-prompt-text");""===this.value&&c.removeClass("screen-reader-text"),c.click(function(){a(this).addClass("screen-reader-text"),b.focus()}),b.blur(function(){""===this.value&&c.removeClass("screen-reader-text")}),b.focus(function(){c.addClass("screen-reader-text")})}),a("#quick-press").on("click focusin",function(){wpActiveEditor="content"})},quickPressLoad()});
\ No newline at end of file
+var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){function b(){var a=1,b=parseInt(jQuery(window).width());b>799&&1299>b&&(a=2),b>1300&&1799>b&&(a=3),b>1800&&(a=4),jQuery(".metabox-holder").attr("class",jQuery(".metabox-holder").attr("class").replace(/columns-\d+/,"columns-"+a))}var c=a("#welcome-panel"),d=a("#wp_welcome_panel-hide"),e=function(b){a.post(ajaxurl,{action:"update-welcome-panel",visible:b,welcomepanelnonce:a("#welcomepanelnonce").val()})};c.hasClass("hidden")&&d.prop("checked")&&c.removeClass("hidden"),a(".welcome-panel-close, .welcome-panel-dismiss a",c).click(function(b){b.preventDefault(),c.addClass("hidden"),e(0),a("#wp_welcome_panel-hide").prop("checked",!1)}),d.click(function(){c.toggleClass("hidden",!this.checked),e(this.checked?1:0)}),ajaxWidgets=["dashboard_rss"],ajaxPopulateWidgets=function(b){function c(b,c){var d,e=a("#"+c+" div.inside:visible").find(".widget-loading");e.length&&(d=e.parent(),setTimeout(function(){d.load(ajaxurl+"?action=dashboard-widgets&widget="+c,"",function(){d.hide().slideDown("normal",function(){a(this).css("display","")})})},500*b))}b?(b=b.toString(),-1!=a.inArray(b,ajaxWidgets)&&c(0,b)):a.each(ajaxWidgets,c)},ajaxPopulateWidgets(),postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets}),quickPressLoad=function(){var b,c=a("#quickpost-action");b=a("#quick-press").submit(function(){function c(){var b=a("#draft-list li").first();b.css("background","#fffbe5"),setTimeout(function(){b.css("background","none")},1e3)}return a("#dashboard_quick_draft #publishing-action .spinner").show(),a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop("disabled",!0),a.post(b.attr("action"),b.serializeArray(),function(b){a("#dashboard_quick_draft .inside").html(b),a("#quick-press").removeClass("initial-form"),quickPressLoad(),c(),a("#title").focus()}),!1}),a("#publish").click(function(){c.val("post-quickpress-publish")}),a("#title, #tags-input, #content").each(function(){var b=a(this),c=a("#"+this.id+"-prompt-text");""===this.value&&c.removeClass("screen-reader-text"),c.click(function(){a(this).addClass("screen-reader-text"),b.focus()}),b.blur(function(){""===this.value&&c.removeClass("screen-reader-text")}),b.focus(function(){c.addClass("screen-reader-text")})}),a("#quick-press").on("click focusin",function(){a(this).addClass("quickpress-open"),a("#description-wrap, p.submit").slideDown(200),wpActiveEditor="content"})},quickPressLoad(),a(".show-more a").on("click",function(b){a(this).fadeOut().closest(".activity-block").find("li.hidden").fadeIn().removeClass("hidden"),b.preventDefault()}),jQuery(document).ready(function(){b()}),jQuery(window).resize(_.debounce(function(){b()},30))});
\ No newline at end of file
diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js
index 26e9982e28..a8d44673d9 100644
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -27,7 +27,7 @@ jQuery(document).ready(function($) {
$(window).resize(function(){ tb_position(); });
- $('#dashboard_plugins, .plugins').on( 'click', 'a.thickbox', function() {
+ $('.plugins').on( 'click', 'a.thickbox', function() {
tb_click.call(this);
$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
diff --git a/wp-admin/js/plugin-install.min.js b/wp-admin/js/plugin-install.min.js
index 321811a02d..abade9d049 100644
--- a/wp-admin/js/plugin-install.min.js
+++ b/wp-admin/js/plugin-install.min.js
@@ -1 +1 @@
-var tb_position;jQuery(document).ready(function(a){tb_position=function(){var b=a("#TB_window"),c=a(window).width(),d=a(window).height(),e=c>720?720:c,f=0;return a("body.admin-bar").length&&(f=28),b.size()&&(b.width(e-50).height(d-45-f),a("#TB_iframeContent").width(e-50).height(d-75-f),b.css({"margin-left":"-"+parseInt((e-50)/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&b.css({top:20+f+"px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+(e-80)+"&height="+(d-85-f)))})},a(window).resize(function(){tb_position()}),a("#dashboard_plugins, .plugins").on("click","a.thickbox",function(){return tb_click.call(this),a("#TB_title").css({"background-color":"#222",color:"#cfcfcf"}),a("#TB_ajaxWindowTitle").html("
"+plugininstallL10n.plugin_information+" "+a(this).attr("title")),!1}),a("#plugin-information #sidemenu a").click(function(){var b=a(this).attr("name");return a("#plugin-information-header a.current").removeClass("current"),a(this).addClass("current"),a("#section-holder div.section").hide(),a("#section-"+b).show(),!1}),a("a.install-now").click(function(){return confirm(plugininstallL10n.ays)})});
\ No newline at end of file
+var tb_position;jQuery(document).ready(function(a){tb_position=function(){var b=a("#TB_window"),c=a(window).width(),d=a(window).height(),e=c>720?720:c,f=0;return a("body.admin-bar").length&&(f=28),b.size()&&(b.width(e-50).height(d-45-f),a("#TB_iframeContent").width(e-50).height(d-75-f),b.css({"margin-left":"-"+parseInt((e-50)/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&b.css({top:20+f+"px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+(e-80)+"&height="+(d-85-f)))})},a(window).resize(function(){tb_position()}),a(".plugins").on("click","a.thickbox",function(){return tb_click.call(this),a("#TB_title").css({"background-color":"#222",color:"#cfcfcf"}),a("#TB_ajaxWindowTitle").html("
"+plugininstallL10n.plugin_information+" "+a(this).attr("title")),!1}),a("#plugin-information #sidemenu a").click(function(){var b=a(this).attr("name");return a("#plugin-information-header a.current").removeClass("current"),a(this).addClass("current"),a("#section-holder div.section").hide(),a("#section-"+b).show(),!1}),a("a.install-now").click(function(){return confirm(plugininstallL10n.ays)})});
\ No newline at end of file
diff --git a/wp-admin/post.php b/wp-admin/post.php
index b832004ff7..536c18c0bf 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -66,8 +66,6 @@ function redirect_post($post_id = '') {
$location = add_query_arg( 'message', 3, wp_get_referer() );
$location = explode('#', $location);
$location = $location[0] . '#postcustom';
- } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) {
- $location = "post.php?action=edit&post=$post_id&message=7";
} else {
$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
}
@@ -96,30 +94,40 @@ if ( ! $sendback ||
}
switch($action) {
+case 'post-quickdraft-save':
+ // Check nonce and capabilities
+ $nonce = $_REQUEST['_wpnonce'];
+ $error_msg = false;
+ if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
+ $error_msg = 'Unable to submit this form, please refresh and try again.';
+
+ if ( ! current_user_can( 'edit_posts' ) )
+ $error_msg = "Oops, you don't have access to add new drafts.";
+
+ if ( $error_msg )
+ return wp_dashboard_quick_draft( $error_msg );
+
+ $post = get_post( $_REQUEST['post_ID'] );
+ check_admin_referer( 'add-' . $post->post_type );
+ edit_post();
+ // output the quickdraft dashboard widget
+ require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+ wp_dashboard_quick_draft();
+ exit;
+ break;
+
case 'postajaxpost':
case 'post':
-case 'post-quickpress-publish':
-case 'post-quickpress-save':
- check_admin_referer('add-' . $post_type);
+ // Check nonce and capabilities
+ $nonce = $_REQUEST['_wpnonce'];
+ $error_msg = false;
+ if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
+ $error_msg = 'Unable to submit this form, please refresh and try again.';
- if ( 'post-quickpress-publish' == $action )
- $_POST['publish'] = 'publish'; // tell write_post() to publish
+ if ( ! current_user_can( 'edit_posts' ) )
+ $error_msg = "Oops, you don't have access to add new drafts.";
- if ( 'post-quickpress-publish' == $action || 'post-quickpress-save' == $action ) {
- $_POST['comment_status'] = get_option('default_comment_status');
- $_POST['ping_status'] = get_option('default_ping_status');
- $post_id = edit_post();
- } else {
- $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
- }
-
- if ( 0 === strpos( $action, 'post-quickpress' ) ) {
- $_POST['post_ID'] = $post_id;
- // output the quickpress dashboard widget
- require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
- wp_dashboard_quick_press();
- exit;
- }
+ $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
redirect_post($post_id);
exit();
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 84bc7af686..cda66c0457 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -904,7 +904,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( $link == '' ) {
echo "
$title{$date}{$summary}{$author} ";
} else {
- echo "
{$date}{$summary}{$author} ";
+ echo "
{$summary}{$author} ";
}
}
echo '';