<!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>[23811] trunk/wp-includes: Minor revisions PHP reorg, code cleanup, restores _post_restored_from functionality.</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, #logmsg > ol { margin-left: 0; 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/23811">23811</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-03-27 11:56:28 +0000 (Wed, 27 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor revisions PHP reorg, code cleanup, restores _post_restored_from functionality.
props adamsilverstein. see <a href="http://core.trac.wordpress.org/ticket/23497">#23497</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesrevisionphp">trunk/wp-includes/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (23810 => 23811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2013-03-27 11:46:08 UTC (rev 23810)
+++ trunk/wp-includes/pluggable.php 2013-03-27 11:56:28 UTC (rev 23811)
</span><span class="lines">@@ -1745,68 +1745,3 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-if ( !function_exists( 'wp_text_diff_with_count' ) ) :
-/**
- * Displays a human readable HTML representation of the difference between two strings.
- * similar to wp_text_diff, but tracks and returns could of lines added and removed
- *
- * @since 3.6
- * @see wp_parse_args() Used to change defaults to user defined settings.
- * @uses Text_Diff
- * @uses WP_Text_Diff_Renderer_Table
- *
- * @param string $left_string "old" (left) version of string
- * @param string $right_string "new" (right) version of string
- * @param string|array $args Optional. Change 'title', 'title_left', and 'title_right' defaults.
- * @return array contains html, linesadded & linesdeletd, empty string if strings are equivalent.
- */
-function wp_text_diff_with_count( $left_string, $right_string, $args = null ) {
- $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
- $args = wp_parse_args( $args, $defaults );
-
- if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
- require( ABSPATH . WPINC . '/wp-diff.php' );
-
- $left_string = normalize_whitespace( $left_string );
- $right_string = normalize_whitespace( $right_string );
-
- $left_lines = explode( "\n", $left_string );
- $right_lines = explode( "\n", $right_string) ;
-
- $text_diff = new Text_Diff($left_lines, $right_lines );
- $linesadded = $text_diff->countAddedLines();
- $linesdeleted = $text_diff->countDeletedLines();
-
- $renderer = new WP_Text_Diff_Renderer_Table();
- $diff = $renderer->render( $text_diff );
-
- if ( !$diff )
- return '';
-
- $r = "<table class='diff'>\n";
-
- if ( ! empty( $args[ 'show_split_view' ] ) ) {
- $r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
- } else {
- $r .= "<col class='content' />";
- }
-
- if ( $args['title'] || $args['title_left'] || $args['title_right'] )
- $r .= "<thead>";
- if ( $args['title'] )
- $r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
- if ( $args['title_left'] || $args['title_right'] ) {
- $r .= "<tr class='diff-sub-title'>\n";
- $r .= "\t<td></td><th>$args[title_left]</th>\n";
- $r .= "\t<td></td><th>$args[title_right]</th>\n";
- $r .= "</tr>\n";
- }
- if ( $args['title'] || $args['title_left'] || $args['title_right'] )
- $r .= "</thead>\n";
-
- $r .= "<tbody>\n$diff\n</tbody>\n";
- $r .= "</table>";
-
- return array( 'html' => $r, 'linesadded' => $linesadded, 'linesdeleted' => $linesdeleted );
- }
- endif;
</del></span></pre></div>
<a id="trunkwpincludesrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/revision.php (23810 => 23811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/revision.php 2013-03-27 11:46:08 UTC (rev 23810)
+++ trunk/wp-includes/revision.php 2013-03-27 11:56:28 UTC (rev 23811)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> * @subpackage Post_Revisions
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> * @uses wp_get_post_revisions()
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $post_id The post ID.
</span><span class="cx"> * @param int $user_id optional The post author ID.
</span><span class="cx"> * @return object|bool The autosaved data or false on failure or when no autosave exists.
</span><span class="lines">@@ -316,6 +316,13 @@
</span><span class="cx"> if ( $post_id )
</span><span class="cx"> do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
</span><span class="cx">
</span><ins>+ $restore_details = array(
+ 'restored_revision_id' => $revision_id,
+ 'restored_by_user' => get_current_user_id(),
+ 'restored_time' => time()
+ );
+ update_post_meta( $post_id, '_post_restored_from', $restore_details );
+
</ins><span class="cx"> return $post_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -417,16 +424,80 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_first_revision_matches_current_version( $post ) {
</span><span class="cx">
</span><del>- if ( ! $post = get_post( $post ) )
- return false;
</del><ins>+ if ( ! $post = get_post( $post ) )
+ return false;
</ins><span class="cx">
</span><del>- if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
- return false;
</del><ins>+ if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+ return false;
</ins><span class="cx">
</span><del>- $last_revision = array_shift( $revisions );
</del><ins>+ $last_revision = array_shift( $revisions );
</ins><span class="cx">
</span><del>- if ( ! ($last_revision->post_modified == $post->post_modified ) )
- return false;
</del><ins>+ if ( ! ($last_revision->post_modified == $post->post_modified ) )
+ return false;
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><ins>+
+/**
+ * Displays a human readable HTML representation of the difference between two strings.
+ * similar to wp_text_diff, but tracks and returns could of lines added and removed
+ *
+ * @since 3.6
+ * @see wp_parse_args() Used to change defaults to user defined settings.
+ * @uses Text_Diff
+ * @uses WP_Text_Diff_Renderer_Table
+ *
+ * @param string $left_string "old" (left) version of string
+ * @param string $right_string "new" (right) version of string
+ * @param string|array $args Optional. Change 'title', 'title_left', and 'title_right' defaults.
+ * @return array contains html, linesadded & linesdeletd, empty string if strings are equivalent.
+ */
+function wp_text_diff_with_count( $left_string, $right_string, $args = null ) {
+ $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
+ $args = wp_parse_args( $args, $defaults );
+
+ if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
+ require( ABSPATH . WPINC . '/wp-diff.php' );
+
+ $left_string = normalize_whitespace( $left_string );
+ $right_string = normalize_whitespace( $right_string );
+
+ $left_lines = explode( "\n", $left_string );
+ $right_lines = explode( "\n", $right_string) ;
+
+ $text_diff = new Text_Diff($left_lines, $right_lines );
+ $linesadded = $text_diff->countAddedLines();
+ $linesdeleted = $text_diff->countDeletedLines();
+
+ $renderer = new WP_Text_Diff_Renderer_Table();
+ $diff = $renderer->render( $text_diff );
+
+ if ( !$diff )
+ return '';
+
+ $r = "<table class='diff'>\n";
+
+ if ( ! empty( $args[ 'show_split_view' ] ) ) {
+ $r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
+ } else {
+ $r .= "<col class='content' />";
+ }
+
+ if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+ $r .= "<thead>";
+ if ( $args['title'] )
+ $r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+ if ( $args['title_left'] || $args['title_right'] ) {
+ $r .= "<tr class='diff-sub-title'>\n";
+ $r .= "\t<td></td><th>$args[title_left]</th>\n";
+ $r .= "\t<td></td><th>$args[title_right]</th>\n";
+ $r .= "</tr>\n";
+ }
+ if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+ $r .= "</thead>\n";
+
+ $r .= "<tbody>\n$diff\n</tbody>\n";
+ $r .= "</table>";
+
+ return array( 'html' => $r, 'linesadded' => $linesadded, 'linesdeleted' => $linesdeleted );
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>