<!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>[2222] 2013/ahoereth/trunk: Plugging wp_text_diff() function for preserving line breaks and multi-spacing in the revisions viewer when viewing code 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://gsoc.trac.wordpress.org/changeset/2222">2222</a></dd>
<dt>Author</dt> <dd>a.hoereth</dd>
<dt>Date</dt> <dd>2013-08-21 09:35:10 +0000 (Wed, 21 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Plugging wp_text_diff() function for preserving line breaks and multi-spacing in the revisions viewer when viewing code revisions. See <a href="http://gsoc.trac.wordpress.org/ticket/302">#302</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013ahoerethtrunkcoderevisionsphp">2013/ahoereth/trunk/code-revisions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#2013ahoerethtrunkincpluggedphp">2013/ahoereth/trunk/inc/plugged.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013ahoerethtrunkcoderevisionsphp"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/code-revisions.php (2221 => 2222)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/code-revisions.php 2013-08-16 05:06:48 UTC (rev 2221)
+++ 2013/ahoereth/trunk/code-revisions.php 2013-08-21 09:35:10 UTC (rev 2222)
</span><span class="lines">@@ -54,3 +54,10 @@
</span><span class="cx"> include_once( CODE_REVISIONS_DIR . 'inc/class-code-revisions-editors.php' );
</span><span class="cx"> new Code_Revisions_Editors;
</span><span class="cx"> }
</span><ins>+
+/*
+ * Include file containing function for overwriting pluggable WP core function
+ * wp_text_diff().
+ */
+include_once( 'inc/plugged.php' );
+
</ins></span></pre></div>
<a id="2013ahoerethtrunkincpluggedphp"></a>
<div class="addfile"><h4>Added: 2013/ahoereth/trunk/inc/plugged.php (0 => 2222)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/plugged.php (rev 0)
+++ 2013/ahoereth/trunk/inc/plugged.php 2013-08-21 09:35:10 UTC (rev 2222)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<?php
+if ( ! function_exists( 'wp_text_diff' ) ) {
+ /**
+ * Overwritting pluggable function wp_text_diff to prettify indentation and for
+ * preserving empty lines on wp-admin/revisions.php for code revisions.
+ * See original phpdoc in wp-includes/pluggable.php#L1675 for more information
+ * on this function.
+ *
+ * @since 0.7
+ * @see wp-includes/pluggable.php
+ * @see http://core.trac.wordpress.org/browser/trunk/wp-includes/pluggable.php?rev=24490#L1675
+ */
+ function wp_text_diff( $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' );
+
+ // ***
+ if( ! empty( $_REQUEST['post_id'] ) ) {
+ $post = get_post( $_REQUEST['post_id'] );
+ } else {
+ $revision_id = ! empty( $_GET['revision'] ) ? $_GET['revision'] :
+ ( ! empty( $_GET['from' ] ) ? $_GET['from' ] : '' );
+ $revision = get_post( $revision_id );
+ $post = get_post( $revision->post_parent );
+ }
+
+ if ( ! isset( $post ) || CODE_REVISIONS_POST_TYPE != $post->post_type ) {
+ $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);
+ $renderer = new WP_Text_Diff_Renderer_Table( $args );
+ $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 $r;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>