<!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>[6162] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory, Author Card: Display close reason for closed or disabled plugins.</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" 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/6162">6162</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/6162","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-23 02:08:54 +0000 (Thu, 23 Nov 2017)</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, Author Card: Display close reason for closed or disabled plugins.

Fixes <a href="http://meta.trac.wordpress.org/ticket/3278">#3278</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassauthorcardphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasscontrolsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-controls.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassauthorcardphp"></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-author-card.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-author-card.php     2017-11-22 23:37:14 UTC (rev 6161)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php       2017-11-23 02:08:54 UTC (rev 6162)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> require_once dirname( dirname( __DIR__ ) ) . '/class-tools.php';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Template;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Tools;
</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">@@ -152,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        $plugin_slug = $plugin->post_name;
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( in_array( $plugin->post_status, array( 'new', 'pending' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $extra .= ' (requested ' . human_time_diff( strtotime( $last_updated ) ) . ' ago)';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $extra .= sprintf( '(requested %s ago)', human_time_diff( strtotime( $last_updated ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $tooltips[] = 'Requested, remains unapproved.';
</span><span class="cx" style="display: block; padding: 0 10px">                                                $classes[]  = 'profile-plugin-requested';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,10 +163,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                $plugin_slug = substr( $plugin_slug, 9, - 9 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        } elseif ( 'closed' === $plugin->post_status ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                $extra .= sprintf( '(closed: %s)', Template::get_close_reason( $plugin ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $tooltips[] = 'Plugin is closed.';
</span><span class="cx" style="display: block; padding: 0 10px">                                                $classes[]  = 'profile-plugin-closed';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        } elseif ( 'disabled' === $plugin->post_status ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                $extra .= sprintf( '(disabled: %s)', Template::get_close_reason( $plugin ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $tooltips[] = 'Plugin is disabled (updates are active).';
</span><span class="cx" style="display: block; padding: 0 10px">                                                $classes[]  = 'profile-plugin-closed';
</span><span class="cx" style="display: block; padding: 0 10px">                                                $note = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        vprintf( '<span class="profile-sp-link">[ %s | %s | %s ]</span>', $plugin_links );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $extra ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                echo $extra;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         echo ' ' . $extra;
</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">                                        echo '</span></li>';
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasscontrolsphp"></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-controls.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-controls.php        2017-11-22 23:37:14 UTC (rev 6161)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-controls.php  2017-11-23 02:08:54 UTC (rev 6162)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Admin\Status_Transitions;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Template;
</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">  * The Plugin Controls / Publish metabox.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,22 +73,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Get reasons for closing or disabling a plugin.
-        *
-        * @return array Close/disable reason labels.
-        */
-       public static function get_close_reasons() {
-               return array(
-                       'security-issue'                => __( 'Security Issue', 'wporg-plugins' ),
-                       'author-request'                => __( 'Author Request', 'wporg-plugins' ),
-                       'guideline-violation'           => __( 'Guideline Violation', 'wporg-plugins' ),
-                       'licensing-trademark-violation' => __( 'Licensing/Trademark Violation', 'wporg-plugins' ),
-                       'merged-into-core'              => __( 'Merged into Core', 'wporg-plugins' ),
-                       'unused'                        => __( 'Unused', 'wporg-plugins' ),
-               );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * Displays the Plugin Status control in the Publish metabox.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        protected static function display_post_status() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,16 +89,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $statuses = Status_Transitions::get_allowed_transitions( $post->post_status );
</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">-                $close_reasons = self::get_close_reasons();
-               $close_reason  = (string) get_post_meta( $post->ID, '_close_reason', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $close_reasons  = Template::get_close_reasons();
+               $close_reason   = (string) get_post_meta( $post->ID, '_close_reason', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( isset( $close_reasons[ $close_reason ] ) ) {
-                       $reason_label   = $close_reasons[ $close_reason ];
-                       $reason_unknown = false;
-               } else {
-                       $reason_label   = _x( 'Unknown', 'unknown close reason', 'wporg-plugins' );
-                       $reason_unknown = true;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $reason_label   = Template::get_close_reason();
+               $reason_unknown = ( _x( 'Unknown', 'unknown close reason', 'wporg-plugins' ) === $reason_label );
</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>
</span><span class="cx" style="display: block; padding: 0 10px">                <div class="misc-pub-section misc-pub-plugin-status">
</span><span class="cx" style="display: block; padding: 0 10px">                        <label for="post_status"><?php _e( 'Status:', 'wporg-plugins' ); ?></label>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp"></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/class-template.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/class-template.php      2017-11-22 23:37:14 UTC (rev 6161)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php        2017-11-23 02:08:54 UTC (rev 6162)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,6 +662,43 @@
</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">+         * Returns the reasons for closing or disabling a plugin.
+        *
+        * @return array Close/disable reason labels.
+        */
+       public static function get_close_reasons() {
+               return array(
+                       'security-issue'                => __( 'Security Issue', 'wporg-plugins' ),
+                       'author-request'                => __( 'Author Request', 'wporg-plugins' ),
+                       'guideline-violation'           => __( 'Guideline Violation', 'wporg-plugins' ),
+                       'licensing-trademark-violation' => __( 'Licensing/Trademark Violation', 'wporg-plugins' ),
+                       'merged-into-core'              => __( 'Merged into Core', 'wporg-plugins' ),
+                       'unused'                        => __( 'Unused', 'wporg-plugins' ),
+               );
+       }
+
+       /**
+        * Returns the close/disable reason for a plugin.
+        *
+        * @param int|\WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
+        * @return string Close/disable reason.
+        */
+       public static function get_close_reason( $post = null ) {
+               $post = get_post( $post );
+
+               $close_reasons = self::get_close_reasons();
+               $close_reason  = (string) get_post_meta( $post->ID, '_close_reason', true );
+               
+               if ( isset( $close_reasons[ $close_reason ] ) ) {
+                       $reason_label = $close_reasons[ $close_reason ];
+               } else {
+                       $reason_label = _x( 'Unknown', 'unknown close reason', 'wporg-plugins' );
+               }
+
+               return $reason_label;
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Adds hreflang link attributes to WordPress.org pages.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @link https://support.google.com/webmasters/answer/189077?hl=en Use hreflang for language and regional URLs.
</span></span></pre>
</div>
</div>

</body>
</html>