<!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>[26221] trunk/src/wp-admin: Merge wp_dashboard_recent_quickdrafts() into wp_dashboard_quick_press().</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/26221">26221</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-15 20:39:37 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge wp_dashboard_recent_quickdrafts() into wp_dashboard_quick_press(). see <a href="http://core.trac.wordpress.org/ticket/25824">#25824</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26220 => 26221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-15 20:14:44 UTC (rev 26220)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-15 20:39:37 UTC (rev 26221)
</span><span class="lines">@@ -3093,27 +3093,27 @@
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#draft-list {
</del><ins>+#dashboard_quick_press .drafts ul {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#draft-list li {
</del><ins>+#dashboard_quick_press .drafts li {
</ins><span class="cx"> margin-bottom: 1em;
</span><span class="cx"> }
</span><del>-#draft-list li time {
</del><ins>+#dashboard_quick_press .drafts li time {
</ins><span class="cx"> color: #bbb;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#draft-list p {
</del><ins>+#dashboard_quick_press .drafts p {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#draft-list .draft-title {
</del><ins>+#dashboard_quick_press .draft-title {
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#draft-list .draft-title a,
-#draft-list .draft-title time {
</del><ins>+#dashboard_quick_press .draft-title a,
+#dashboard_quick_press .draft-title time {
</ins><span class="cx"> float: left;
</span><span class="cx"> margin: 0 5px 0 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/dashboard.php (26220 => 26221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/dashboard.php 2013-11-15 20:14:44 UTC (rev 26220)
+++ trunk/src/wp-admin/includes/dashboard.php 2013-11-15 20:39:37 UTC (rev 26221)
</span><span class="lines">@@ -337,63 +337,39 @@
</span><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> </form>
</span><del>-
-<?php
- wp_dashboard_recent_quickdrafts();
-}
-
-/**
- * Show `Recent Drafts` below Quick Draft form
- *
- *
- *
- * @since 3.8.0
- *
- */
-function wp_dashboard_recent_quickdrafts() {
-
</del><ins>+ <?php
</ins><span class="cx"> $query_args = array(
</span><span class="cx"> 'post_type' => 'post',
</span><span class="cx"> 'post_status' => 'draft',
</span><del>- 'author' => $GLOBALS['current_user']->ID,
</del><ins>+ 'author' => get_current_user_id(),
</ins><span class="cx"> 'posts_per_page' => 4,
</span><span class="cx"> 'orderby' => 'modified',
</span><span class="cx"> 'order' => 'DESC'
</span><span class="cx"> );
</span><del>- $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 = '<div class="draft-title"><a href="' . $url . '" title="' . sprintf( __( 'Edit “%s”' ), esc_attr( $title ) ) . '">' . esc_html( $title ) . '</a> <time datetime="' . get_the_time( 'c', $draft) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . '</time></div>';
- if ( $the_content = wp_trim_words( $draft->post_content, 10 ) )
- $item .= '<p>' . $the_content . '</p>';
- $list[] = $item;
- }
-
- do_action( 'dashboard_quickdraft_drafts_list', $drafts );
-?>
- <div class="drafts">
- <?php if ( 3 < count($drafts) ) { ?>
- <p class="view-all"><a href="edit.php?post_status=draft" ><?php _e( 'View all' ); ?></a></p>
- <?php } ?>
- <h4><?php _e('Drafts'); ?></h4>
- <ul id="draft-list">
- <li><?php echo join( "</li>\n<li>", $list ); ?></li>
- </ul>
- </div>
-<?php }
</del><ins>+ $drafts = get_posts( $query_args );
+ if ( ! $drafts ) {
+ return;
+ }
+
+ echo '<div class="drafts">';
+ if ( count( $drafts ) > 3 ) {
+ echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '">' . _x( 'View all', 'drafts' ) . "</a></p>\n";
+ }
+ echo '<h4>' . __( 'Drafts' ) . "</h4>\n<ul>";
+
+ $drafts = array_slice( $drafts, 0, 3 );
+ foreach ( $drafts as $draft ) {
+ $url = get_edit_post_link( $draft->ID );
+ $title = _draft_or_post_title( $draft->ID );
+ echo "<li>\n";
+ echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" title="' . esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
+ echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . '</time></div>';
+ if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
+ echo '<p>' . $the_content . '</p>';
+ }
+ echo "</li>\n";
+ }
+ echo "</ul>\n</div>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
</span></span></pre>
</div>
</div>
</body>
</html>