<!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>[2106] 2013/ahoereth/trunk/inc/editors.php: On a direct file change of a file edited in the wp editors before..</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/2106">2106</a></dd>
<dt>Author</dt> <dd>a.hoereth</dd>
<dt>Date</dt> <dd>2013-07-11 12:03:08 +0000 (Thu, 11 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>On a direct file change of a file edited in the wp editors before..
* Notify user (in <a href="http://gsoc.trac.wordpress.org/changeset/2102">[2102]</a> and <a href="http://gsoc.trac.wordpress.org/changeset/2103">[2103]</a>)
* Update post in order to add a new revision
* Provide user with a link to directly view changes
Fixes <a href="http://gsoc.trac.wordpress.org/ticket/303">#303</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013ahoerethtrunkinceditorsphp">2013/ahoereth/trunk/inc/editors.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013ahoerethtrunkinceditorsphp"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/inc/editors.php (2105 => 2106)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/editors.php 2013-07-10 19:06:35 UTC (rev 2105)
+++ 2013/ahoereth/trunk/inc/editors.php 2013-07-11 12:03:08 UTC (rev 2106)
</span><span class="lines">@@ -200,7 +200,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Checks if the file changed since last visit.
</del><ins>+ * Checks if the file changed since last visit and, if thats the case,
+ * notifies the user and updates the post.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.4
</span><span class="cx"> */
</span><span class="lines">@@ -215,20 +216,37 @@
</span><span class="cx">
</span><span class="cx"> // update checksum in database
</span><span class="cx"> update_post_meta( $this->id, $this->metakey, $this->meta );
</span><ins>+
+ // read file
+ $new = @file_get_contents( $this->get_abs() );
+
+ // error occured when reading the file
+ if ( false === $new )
+ return false;
+
+ // update post
+ $this->update( $new );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Used for displaying an admin notice above the editor which notifies the user
</span><span class="cx"> * that the file changed since his last visit.
</span><ins>+ *
+ * @since 0.4
+ * @uses wp_get_post_revisions()
+ * @uses get_edit_post_link()
</ins><span class="cx"> */
</span><del>- public function notice() { ?>
</del><ins>+ public function notice() {
+ $revision = array_keys( wp_get_post_revisions( $this->id, array( 'numberposts' => 1 ) ) );
+ $link = get_edit_post_link( $revision[0] );
+ ?>
</ins><span class="cx"> <div class="updated">
</span><span class="cx"> <p>
</span><span class="cx"> <?php _e('This file has changed since the last time you viewed it in the editor.','code-revisions'); ?>
</span><del>- <a href="#"><?php _e('View changes','code-revisions'); ?></a>
</del><ins>+ <?php echo "<a href='$link'>".__('View changes','code-revisions')."</a>"; ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </div>
</span><del>-<?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -262,7 +280,6 @@
</span><span class="cx"> * @since 0.1
</span><span class="cx"> * @uses wp_update_post
</span><span class="cx"> *
</span><del>- * @param int $id target post id
</del><span class="cx"> * @param string $content new file contents
</span><span class="cx"> * @return int post id on success, otherwise zero
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>