<!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>[12594] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin: Plugin Directory: Clear the assigned reviewer on the appropriate status transitions (->approved and ->publish).</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/12594">12594</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/12594","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-18 03:26:43 +0000 (Thu, 18 May 2023)</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'>Plugin Directory: Clear the assigned reviewer on the appropriate status transitions (->approved and ->publish).
See <a href="http://meta.trac.wordpress.org/ticket/6993">#6993</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassreviewerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-reviewer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp"></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/plugin-directory/admin/class-customizations.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/plugin-directory/admin/class-customizations.php 2023-05-18 03:25:32 UTC (rev 12593)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php 2023-05-18 03:26:43 UTC (rev 12594)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,9 +68,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Release_Confirmation', 'save_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Author_Notice', 'save_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Reviewer', 'save_post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Audit logs
- add_action( 'updated_postmeta', array( $this, 'updated_postmeta' ), 10, 4 );
</del><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -857,23 +854,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $keys;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Watch for post_meta updates and log accordingly.
- */
- public function updated_postmeta( $meta_id, $post_id, $meta_key, $meta_value ) {
- if ( 'assigned_reviewer' === $meta_key && $meta_value ) {
- $reviewer = get_user_by( 'id', $meta_value );
- Tools::audit_log(
- sprintf(
- 'Assigned to <a href="%s">%s</a>.',
- esc_url( 'https://profiles.wordpress.org/' . $reviewer->user_nicename . '/' ),
- $reviewer->display_name ?: $reviewer->user_login
- ),
- get_post( $post_id )
- );
- } elseif ( 'assigned_reviewer' === $meta_key && ! $meta_value ) {
- Tools::audit_log( 'Unassigned.', get_post( $post_id ) );
- }
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp"></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/plugin-directory/admin/class-status-transitions.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/plugin-directory/admin/class-status-transitions.php 2023-05-18 03:25:32 UTC (rev 12593)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php 2023-05-18 03:26:43 UTC (rev 12594)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Email\Plugin_Approved as Plugin_Approved_Email;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Email\Plugin_Rejected as Plugin_Rejected_Email;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Admin\Metabox\Reviewer as Reviewer_Metabox;
</ins><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"> * All functionality related to Status Transitions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,15 +135,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $new_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'approved':
</span><span class="cx" style="display: block; padding: 0 10px"> $this->approved( $post->ID, $post );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->clear_reviewer( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rejected':
</span><span class="cx" style="display: block; padding: 0 10px"> $this->rejected( $post->ID, $post );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->clear_reviewer( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'publish':
</span><span class="cx" style="display: block; padding: 0 10px"> $this->clean_closed_date( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_translation_status( $post, 'active' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->clear_reviewer( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'disabled':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,4 +367,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), $post_id );
</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">+ /**
+ * Clear the assigned reviewer.
+ *
+ * @param \WP_Post $post Post object.
+ */
+ public function clear_reviewer( $post ) {
+ // Unset the reviewer, but don't log it, as the triggering status changes should've been logged in some form.
+ Reviewer_Metabox::set_reviewer( $post, false, false );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassreviewerphp"></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/plugin-directory/admin/metabox/class-reviewer.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/plugin-directory/admin/metabox/class-reviewer.php 2023-05-18 03:25:32 UTC (rev 12593)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-reviewer.php 2023-05-18 03:26:43 UTC (rev 12594)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,8 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- update_post_meta( $post_id, 'assigned_reviewer', $reviewer_id );
- update_post_meta( $post_id, 'assigned_reviewer_time', time() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::set_reviewer( $post_id, $reviewer_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $assigned_reviewer = get_post_meta( $post_id, 'assigned_reviewer', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +125,49 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $reviewer_id = absint( $_POST['assigned_reviewer'] ?? 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $post_id, 'assigned_reviewer', $reviewer_id );
- update_post_meta( $post_id, 'assigned_reviewer_time', time() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::set_reviewer( $post_id, $reviewer_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Set the reviewer for a post.
+ *
+ * @param int|WP_Post $post Post object or ID.
+ * @param int|WP_User $reviewer Reviewer User object or ID.
+ * @param bool $log_it Whether to log the change. Optional.
+ * @return bool
+ */
+ public static function set_reviewer( $post, $reviewer, $log_it = true ) {
+ $post = get_post( $post );
+ $current_reviewer = get_post_meta( $post->ID, 'assigned_reviewer', true );
+ $reviewer = is_object( $reviewer ) ? $reviewer : get_user_by( 'id', $reviewer );
+ $reviewer_id = $reviewer->ID ?? 0;
+
+ if ( $current_reviewer == $reviewer_id || ! $post ) {
+ return false;
+ }
+
+ if ( ! $reviewer ) {
+ delete_post_meta( $post->ID, 'assigned_reviewer' );
+ delete_post_meta( $post->ID, 'assigned_reviewer_time' );
+ } else {
+ update_post_meta( $post->ID, 'assigned_reviewer', $reviewer_id );
+ update_post_meta( $post->ID, 'assigned_reviewer_time', time() );
+ }
+
+ // Audit logging.
+ if ( $log_it ) {
+ $message = 'Unassigned.';
+ if ( $reviewer ) {
+ $message = sprintf(
+ 'Assigned to <a href="%s">%s</a>.',
+ esc_url( 'https://profiles.wordpress.org/' . $reviewer->user_nicename . '/' ),
+ $reviewer->display_name ?: $reviewer->user_login
+ );
+ }
+
+ Tools::audit_log( $message, $post );
+ }
+
+ return true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>