<!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>[2110] 2013/ahoereth/trunk/inc/editors.php: Fixes #324 and #322</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/2110">2110</a></dd>
<dt>Author</dt> <dd>a.hoereth</dd>
<dt>Date</dt> <dd>2013-07-11 15:50:02 +0000 (Thu, 11 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes <a href="http://gsoc.trac.wordpress.org/ticket/324">#324</a> and <a href="http://gsoc.trac.wordpress.org/ticket/322">#322</a>
* unify insert() and update()
* manually create revision on initial use of wp_insert_post</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 (2109 => 2110)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/editors.php 2013-07-11 14:48:25 UTC (rev 2109)
+++ 2013/ahoereth/trunk/inc/editors.php 2013-07-11 15:50:02 UTC (rev 2110)
</span><span class="lines">@@ -188,15 +188,12 @@
</span><span class="cx"> if ( $old === $new )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // update checksum
- $this->meta['checksum'] = md5( $new );
-
</del><span class="cx"> // file wasn't saved to the database yet: save with old content
</span><del>- if ( ! $this->id && ! ( $this->id = $this->insert( $old ) ) )
- return false;
</del><ins>+ if ( ! $this->id )
+ $this->id = $this->dispatch( $old );
</ins><span class="cx">
</span><span class="cx"> // update database entry with new content
</span><del>- return 0 != $this->update( $new );
</del><ins>+ return 0 < $this->dispatch( $new );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -214,9 +211,6 @@
</span><span class="cx"> // add admin notice
</span><span class="cx"> add_action( 'admin_notices', array( &$this, 'notice' ) );
</span><span class="cx">
</span><del>- // update checksum in database
- update_post_meta( $this->id, $this->metakey, $this->meta );
-
</del><span class="cx"> // read file
</span><span class="cx"> $new = @file_get_contents( $this->get_abs() );
</span><span class="cx">
</span><span class="lines">@@ -225,7 +219,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // update post
</span><del>- $this->update( $new );
</del><ins>+ $this->dispatch( $new );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -250,54 +244,44 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Save file contents into new post. Used on the first edit of a file.
</del><ins>+ * Depending on if a post for this file already exists in the database the
+ * function either creates a new post or updates the existing post with the
+ * new content.
</ins><span class="cx"> *
</span><del>- * @since 0.1
- * @uses wp_insert_post
</del><ins>+ * @since 0.4
+ * @uses wp_update_post()
+ * @uses wp_inser_post()
+ * @uses wp_save_post_revision()
</ins><span class="cx"> *
</span><del>- * @param string $content the file's contents
- * @return int post id
- */
- private function insert( $content ) {
- $args = array(
- 'post_type' => CODE_REVISIONS_POST_TYPE,
- 'post_title' => $this->title,
- 'post_name' => sanitize_title( $this->title ),
- 'post_content' => $content,
- 'post_status' => 'private', // only visible to admins, same is applicable for the editors
- );
- $id = wp_insert_post( $args );
-
- if ( ! add_post_meta( $id, $this->metakey, $this->meta, true ) )
- return 0;
-
- return $id;
- }
-
- /**
- * Update already existing post with new file contents.
- *
- * @since 0.1
- * @uses wp_update_post
- *
</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><del>- private function update( $content ) {
</del><ins>+ private function dispatch( $content ) {
</ins><span class="cx"> $args = array(
</span><del>- 'ID' => $this->id,
</del><span class="cx"> 'post_type' => CODE_REVISIONS_POST_TYPE,
</span><span class="cx"> 'post_title' => $this->title,
</span><span class="cx"> 'post_name' => sanitize_title( $this->title ),
</span><span class="cx"> 'post_content' => $content,
</span><span class="cx"> 'post_status' => 'private',
</span><span class="cx"> );
</span><del>- wp_update_post( $args );
</del><span class="cx">
</span><del>- if ( ! update_post_meta( $this->id, $this->metakey, $this->meta ) )
- return 0;
</del><ins>+ // update post
+ if ( 0 < $this->id ){
+ $args['ID'] = $this->id;
+ $id = wp_update_post($args);
+ }
</ins><span class="cx">
</span><del>- return $this->id;
</del><ins>+ // insert post
+ else {
+ $id = wp_insert_post( $args );
+ wp_save_post_revision( $id );
+ }
+
+ // update/insert post meta with new checksum
+ $this->meta['checksum'] = md5( $content );
+ update_post_meta( $id, $this->metakey, $this->meta );
+
+ return $id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -305,7 +289,7 @@
</span><span class="cx"> * (specified by $this->title) from the database.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.1
</span><del>- * @uses get_posts
</del><ins>+ * @uses get_posts()
</ins><span class="cx"> *
</span><span class="cx"> * @return int post_id on success : zero on error
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>