<!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>[24175] trunk: Revisions: Mark deprecated arguments in `wp_list_post_revisions()`.</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/24175">24175</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-05-04 12:54:00 +0000 (Sat, 04 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: Mark deprecated arguments in `wp_list_post_revisions()`.
* Second argument is now a string, which controls the revision type
* Back compat for $args['type']
* Remove lines for the old form-table format, since it's now just a list
props a.hoereth. fixes <a href="http://core.trac.wordpress.org/ticket/24213">#24213</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (24174 => 24175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2013-05-03 23:17:06 UTC (rev 24174)
+++ trunk/wp-admin/includes/meta-boxes.php 2013-05-04 12:54:00 UTC (rev 24175)
</span><span class="lines">@@ -602,8 +602,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @param object $post
</span><span class="cx"> */
</span><del>-function post_revisions_meta_box($post) {
- wp_list_post_revisions();
</del><ins>+function post_revisions_meta_box( $post ) {
+ wp_list_post_revisions( $post );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // -- Page related Meta Boxes
</span><span class="lines">@@ -979,4 +979,4 @@
</span><span class="cx"> function post_thumbnail_meta_box( $post ) {
</span><span class="cx"> $thumbnail_id = get_post_meta( $post->ID, '_thumbnail_id', true );
</span><span class="cx"> echo _wp_post_thumbnail_html( $thumbnail_id, $post->ID );
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (24174 => 24175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-05-03 23:17:06 UTC (rev 24174)
+++ trunk/wp-includes/post-template.php 2013-05-04 12:54:00 UTC (rev 24175)
</span><span class="lines">@@ -1384,17 +1384,6 @@
</span><span class="cx"> * Can output either a UL with edit links or a TABLE with diff interface, and
</span><span class="cx"> * restore action links.
</span><span class="cx"> *
</span><del>- * Second argument controls parameters:
- * (bool) parent : include the parent (the "Current Revision") in the list.
- * Deprecated (ignored), since 3.6 the revisions always include
- * a copy of the current post.
- * (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
- * outputs TABLE with UI.
- * (int) right : what revision is currently being viewed - used in
- * form-table format.
- * (int) left : what revision is currently being diffed against right -
- * used in form-table format.
- *
</del><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Post_Revisions
</span><span class="cx"> * @since 2.6.0
</span><span class="lines">@@ -1404,25 +1393,26 @@
</span><span class="cx"> * @uses get_edit_post_link()
</span><span class="cx"> * @uses get_the_author_meta()
</span><span class="cx"> *
</span><del>- * @todo split into two functions (list, form-table) ?
- *
</del><span class="cx"> * @param int|object $post_id Post ID or post object.
</span><del>- * @param string|array $args See description {@link wp_parse_args()}.
</del><ins>+ * @param string $type 'all' (default), 'revision' or 'autosave'
</ins><span class="cx"> * @return null
</span><span class="cx"> */
</span><del>-function wp_list_post_revisions( $post_id = 0, $args = null ) {
- if ( !$post = get_post( $post_id ) )
</del><ins>+function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
+ if ( ! $post = get_post( $post_id ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $defaults = array( 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' );
- extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
</del><ins>+ // $args array with (parent, format, right, left, type) deprecated since 3.6
+ if ( is_array( $type ) ) {
+ $type = ! empty( $type['type'] ) ? $type['type'] : $type;
+ _deprecated_argument( __FUNCTION__, '3.6' );
+ }
</ins><span class="cx">
</span><del>- if ( !$revisions = wp_get_post_revisions( $post->ID ) )
</del><ins>+ if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $rows = '';
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- if ( !current_user_can( 'read_post', $revision->ID ) )
</del><ins>+ if ( ! current_user_can( 'read_post', $revision->ID ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $is_autosave = wp_is_post_autosave( $revision );
</span><span class="lines">@@ -1432,74 +1422,33 @@
</span><span class="cx"> $rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'form-table' == $format ) : ?>
</del><ins>+ echo "<ul class='post-revisions'>\n";
+ echo $rows;
</ins><span class="cx">
</span><del>-<form action="revision.php" method="get">
-
-<div class="tablenav">
- <div class="alignleft">
- <input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Compare Revisions' ); ?>" />
- <input type="hidden" name="action" value="diff" />
- <input type="hidden" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
- </div>
-</div>
-
-<br class="clear" />
-
-<table class="widefat post-revisions" cellspacing="0" id="post-revisions">
- <col />
- <col />
- <col style="width: 33%" />
- <col style="width: 33%" />
- <col style="width: 33%" />
-<thead>
-<tr>
- <th scope="col"><?php /* translators: column name in revisions */ _ex( 'Old', 'revisions column name' ); ?></th>
- <th scope="col"><?php /* translators: column name in revisions */ _ex( 'New', 'revisions column name' ); ?></th>
- <th scope="col"><?php /* translators: column name in revisions */ _ex( 'Date Created', 'revisions column name' ); ?></th>
- <th scope="col"><?php _e( 'Author' ); ?></th>
- <th scope="col" class="action-links"><?php _e( 'Actions' ); ?></th>
-</tr>
-</thead>
-<tbody>
-
-<?php echo $rows; ?>
-
-</tbody>
-</table>
-
-</form>
-
-<?php
- else :
- echo "<ul class='post-revisions'>\n";
- echo $rows;
-
- // if the post was previously restored from a revision
- // show the restore event details
- if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
- $author = get_user_by( 'id', $restored_from_meta[ 'restored_by_user' ] );
- /* translators: revision date format, see http://php.net/date */
- $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
- $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
- $time_diff = human_time_diff( $restored_from_meta[ 'restored_time' ] ) ;
</del><ins>+ // if the post was previously restored from a revision
+ // show the restore event details
+ if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
+ $author = get_user_by( 'id', $restored_from_meta[ 'restored_by_user' ] );
+ /* translators: revision date format, see http://php.net/date */
+ $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
+ $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
+ $time_diff = human_time_diff( $restored_from_meta[ 'restored_time' ] ) ;
+ ?>
+ <hr />
+ <div id="revisions-meta-restored">
+ <?php
+ printf(
+ /* translators: restored revision details: 1: gravatar image, 2: author name, 3: time ago, 4: date */
+ __( 'Previously restored by %1$s %2$s, %3$s ago (%4$s)' ),
+ get_avatar( $author->ID, 24 ),
+ $author->display_name,
+ $time_diff,
+ $date
+ );
</ins><span class="cx"> ?>
</span><del>- <hr />
- <div id="revisions-meta-restored">
- <?php
- printf(
- /* translators: restored revision details: 1: gravatar image, 2: author name, 3: time ago, 4: date */
- __( 'Previously restored by %1$s %2$s, %3$s ago (%4$s)' ),
- get_avatar( $author->ID, 24 ),
- $author->display_name,
- $time_diff,
- $date
- );
- ?>
- </div>
- <?php
</del><ins>+ </div>
+ <?php
</ins><span class="cx"> echo "</ul>";
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><del>- endif;
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>