<!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>[8786] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php: Markdown Importer: Update manifest-provided page fields if they've changed but the page's source content hasn't changed.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8786">8786</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8786","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-13 22:05:27 +0000 (Mon, 13 May 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Markdown Importer: Update manifest-provided page fields if they've changed but the page's source content hasn't changed.
In cases where a 304 response indicates the source for an imported page hasn't changed since the last fetch, the manifest itself may have been updated with new page-related field values. These currently include menu_order, post_parent, and post_title. Ensure these page attributes get updated.
See <a href="http://meta.trac.wordpress.org/ticket/4388">#4388</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgmarkdownincclassimporterphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgmarkdownincclassimporterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php 2019-05-13 18:23:50 UTC (rev 8785)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php 2019-05-13 22:05:27 UTC (rev 8786)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,6 +297,85 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Updates a post for fields that are derived from the manifest.
+ *
+ * A manifest specifies post-related values that may be updated even if the
+ * post's markdown page is not.
+ *
+ * A manifest can set or affect the following post fields:
+ * - menu_order
+ * - post_parent
+ * - post_title
+ *
+ * @param int $post_id Page ID to update.
+ * @param mixed $title Page title from markdown. If false, then no title
+ * handling will occur. If null, then title defined in
+ * manifest will be used. If string, then that's the
+ * title and its value will be compared to manifest value.
+ * @param bool $do_update Optional. Should the post actually be updated?
+ * Default true.
+ * @return array The array of post data that would be used for an update.
+ */
+ protected function update_post_from_manifest( $post_id, $title = false, $do_update = true ) {
+ $post_data = [];
+
+ $manifest_entry = get_post_meta( $post_id, $this->manifest_entry_meta_key, true );
+
+ // Determine value for 'menu_order'.
+ if ( ! empty( $manifest_entry['order'] ) ) {
+ $post_data['menu_order'] = $manifest_entry['order'];
+ }
+
+ // If no title was extracted from markdown doc, use the value defined in manifest.
+ if ( is_null( $title ) ) {
+ if ( ! empty( $manifest_entry['title'] ) ) {
+ $post_data['post_title'] = sanitize_text_field( wp_slash( $manifest_entry['title'] ) );
+ }
+ } elseif ( $title ) {
+ $post_data['post_title'] = sanitize_text_field( wp_slash( $title ) );
+ }
+
+ $parent_id = wp_get_post_parent_id( $post_id );
+
+ // Determine value for 'post_parent'.
+ if ( ! $manifest_entry ) {
+ // Do nothing with regards to possibly changing post parent as we know
+ // nothing about previous import.
+ }
+ // If post had a parent...
+ elseif ( $parent_id ) {
+ $parent = $parent_id ? get_post( $parent_id ) : null;
+ // ...but no parent is now defined, unset parent.
+ if ( empty( $manifest_entry['parent'] ) ) {
+ $post_data['post_parent'] = '';
+ }
+ // ...and it appears to differ from parent now defined, find new parent.
+ elseif ( $manifest_entry['parent'] !== $parent->post_name ) {
+ $find_parent = get_page_by_path( $manifest_entry['parent'], OBJECT, $this->get_post_type() );
+ if ( $find_parent ) {
+ $post_data['post_parent'] = $find_parent->ID;
+ }
+ }
+ }
+ // Does this parentless post now have one newly defined?
+ elseif ( ! empty( $manifest_entry['parent'] ) ) {
+ $find_parent = get_page_by_path( $manifest_entry['parent'], OBJECT, $this->get_post_type() );
+ if ( $find_parent ) {
+ $post_data['post_parent'] = $find_parent->ID;
+ }
+ }
+
+ if ( $do_update && $post_data ) {
+ $post_data['ID'] = $post_id;
+
+ WP_CLI::log( "Updated {$post_id} from manifest source" );
+ wp_update_post( $post_data );
+ }
+
+ return $post_data;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Update a post from its Markdown source.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID to update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +407,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $response;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 304 === wp_remote_retrieve_response_code( $response ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // No update required!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // No content update required. Though certain meta fields that are defined
+ // in the manifest may have been updated.
+ $this->update_post_from_manifest( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid-http-code', 'Markdown source returned non-200 http code.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,50 +453,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => sanitize_text_field( wp_slash( $excerpt ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manifest_entry = get_post_meta( $post_id, $this->manifest_entry_meta_key, true );
-
- if ( ! empty( $manifest_entry['order'] ) ) {
- $post_data['menu_order'] = $manifest_entry['order'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields_from_manifest = $this->update_post_from_manifest( $post_id, $title, false );
+ if ( $fields_from_manifest ) {
+ $post_data = array_merge( $post_data, $fields_from_manifest );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If no title was extracted from markdown doc, use the value defined in manifest.
- if ( is_null( $title ) ) {
- if ( ! empty( $manifest_entry['title'] ) ) {
- $post_data['post_title'] = sanitize_text_field( wp_slash( $manifest_entry['title'] ) );
- }
- } else {
- $post_data['post_title'] = sanitize_text_field( wp_slash( $title ) );
- }
-
- $parent_id = wp_get_post_parent_id( $post_id );
-
- if ( ! $manifest_entry ) {
- // Do nothing with regards to possibly changing post parent as we know
- // nothing about previous import.
- }
- // If post had a parent...
- elseif ( $parent_id ) {
- $parent = $parent_id ? get_post( $parent_id ) : null;
- // ...but no parent is now defined, unset parent.
- if ( empty( $manifest_entry['parent'] ) ) {
- $post_data['post_parent'] = '';
- }
- // ...and it appears to differ from parent now defined, find new parent.
- elseif ( $manifest_entry['parent'] !== $parent->post_name ) {
- $find_parent = get_page_by_path( $manifest_entry['parent'], OBJECT, $this->get_post_type() );
- if ( $find_parent ) {
- $post_data['post_parent'] = $find_parent->ID;
- }
- }
- }
- // Does this parentless post now have one newly defined?
- elseif ( ! empty( $manifest_entry['parent'] ) ) {
- $find_parent = get_page_by_path( $manifest_entry['parent'], OBJECT, $this->get_post_type() );
- if ( $find_parent ) {
- $post_data['post_parent'] = $find_parent->ID;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set ETag for future updates.
</span></span></pre>
</div>
</div>
</body>
</html>