<!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>[2983] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Add meta data on plugin submission.</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/2983">2983</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/2983","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-19 20:09:35 +0000 (Tue, 19 Apr 2016)</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: Add meta data on plugin submission.
Adds readme meta data to the plugin post after uploading a new plugin.
See <a href="http://meta.trac.wordpress.org/ticket/1570">#1570</a>, <a href="http://meta.trac.wordpress.org/ticket/1571">#1571</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasscustomfieldsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-custom-fields.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasscustomfieldsphp"></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-custom-fields.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-custom-fields.php 2016-04-19 20:08:25 UTC (rev 2982)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-custom-fields.php 2016-04-19 20:09:35 UTC (rev 2983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Custom_Fields {
</span><span class="cx" style="display: block; padding: 0 10px"> static function display() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post();
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => 'Latest Plugin Version',
</span><span class="cx" style="display: block; padding: 0 10px"> 'stable_tag' => 'Stable Tag',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,15 +21,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'header_textdomain' => 'Plugin TextDomain',
</span><span class="cx" style="display: block; padding: 0 10px"> 'header_description' => 'Plugin Description',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<dl>';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $field => $text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ($value = get_post_meta( $post->ID, $field, true ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $value = get_post_meta( $post->ID, $field, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<dt>%s</dt><dd>%s</dd>', esc_html( $text ), make_clickable( esc_html( $value ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Description is stored in the post_excerpt rather than meta
- printf( '<dt>%s</dt><dd>%s</dd>', esc_html( $fields['header_description'] ), get_the_excerpt() );
</del><span class="cx" style="display: block; padding: 0 10px"> echo '</dl>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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-plugin-directory.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-plugin-directory.php 2016-04-19 20:08:25 UTC (rev 2982)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2016-04-19 20:09:35 UTC (rev 2983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,15 +466,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $status The status of the plugin ( 'publish', 'pending', 'disabled', 'closed' ).
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $author The ID of the plugin author.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $description The short description of the plugin.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $content The long description of the plugin.
+ * @type array $tags The tags associated with the plugin.
+ * @type array $tags The meta information of the plugin.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return \WP_Post|\WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> static public function create_plugin_post( array $plugin_info ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = !empty( $plugin_info['title'] ) ? $plugin_info['title'] : '';
- $slug = !empty( $plugin_info['slug'] ) ? $plugin_info['slug'] : sanitize_title( $title );
- $status = !empty( $plugin_info['status'] ) ? $plugin_info['status'] : 'pending';
- $author = !empty( $plugin_info['author'] ) ? $plugin_info['author'] : 0;
- $desc = !empty( $plugin_info['description'] ) ? $plugin_info['description'] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ! empty( $plugin_info['title'] ) ? $plugin_info['title'] : '';
+ $slug = ! empty( $plugin_info['slug'] ) ? $plugin_info['slug'] : sanitize_title( $title );
+ $status = ! empty( $plugin_info['status'] ) ? $plugin_info['status'] : 'pending';
+ $author = ! empty( $plugin_info['author'] ) ? $plugin_info['author'] : 0;
+ $desc = ! empty( $plugin_info['description'] ) ? $plugin_info['description'] : '';
+ $content = ! empty( $plugin_info['content'] ) ? $plugin_info['content'] : '';
+ $tags = ! empty( $plugin_info['tags'] ) ? $plugin_info['tags'] : array();
+ $meta = ! empty( $plugin_info['meta'] ) ? $plugin_info['meta'] : array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = wp_insert_post( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'plugin',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,8 +488,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title ?: $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_content' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_content' => $content,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $desc,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tags_input' => $tags,
+ 'meta_input' => $meta,
</ins><span class="cx" style="display: block; padding: 0 10px"> ), true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $id ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></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/shortcodes/class-upload-handler.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/shortcodes/class-upload-handler.php 2016-04-19 20:08:25 UTC (rev 2982)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2016-04-19 20:09:35 UTC (rev 2983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</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\Shortcodes;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Readme_Parser;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Plugin_Directory;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,19 +122,27 @@
</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"> if ( preg_match( '|[^\d\.]|', $this->plugin['Version'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: style.css */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Version header */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Version:</code>'
</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><span class="cx" style="display: block; padding: 0 10px"> // Prevent duplicate URLs.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_uri = $this->plugin['PluginURI'];
- $author_uri = $this->plugin['AuthorURI'];
- if ( ! empty( $plugin_uri ) && ! empty( $author_uri ) && $plugin_uri == $author_uri ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $this->plugin['PluginURI'] ) && ! empty( $this->plugin['AuthorURI'] ) && $this->plugin['PluginURI'] == $this->plugin['AuthorURI'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __( 'Duplicate plugin and author URLs. A plugin URL is a page/site that provides details about this specific plugin. An author URL is a page/site that provides information about the author of the plugin. You aren’t required to provide both, so pick the one that best applies to your URL.', 'wporg-plugins' );
</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">+ $readme = $this->find_readme_file();
+ if ( empty( $readme ) ) {
+ /* translators: 1: readme.txt, 2: readme.md */
+ return sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-plugins' ),
+ '<code>readme.txt</code>',
+ '<code>readme.md</code>'
+ );
+ }
+ $readme = new Readme_Parser( $readme );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Pass it through Plugin Check and see how great this plugin really is.
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->check_plugin();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,13 +157,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Passed all tests!
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's save everything and get things wrapped up.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '';
+ foreach ( $readme->sections as $section => $section_content ) {
+ $content .= "\n\n<!--section={$section}-->\n{$section_content}";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add a Plugin Directory entry for this plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_post = Plugin_Directory::create_plugin_post( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $this->plugin['Name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $this->plugin_slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'status' => 'pending',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => 'draft',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'author' => get_current_user_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => $this->plugin['Description']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => $content,
+ 'description' => $this->plugin['Description'],
+ 'tags' => $readme->tags,
+ 'meta' => array(
+ 'stable_tag' => $readme->stable_tag,
+ 'tested' => $readme->tested,
+ 'requires' => $readme->requires,
+ 'donate_link' => $readme->donate_link,
+ 'version' => $this->plugin['Version'],
+ 'header_plugin_uri' => $this->plugin['PluginURI'],
+ 'header_author' => $this->plugin['Author'],
+ 'header_author_uri' => $this->plugin['AuthorURI'],
+ 'header_textdomain' => $this->plugin['TextDomain'],
+ 'header_description' => $this->plugin['Description'],
+ 'support_resolutions' => 0,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $plugin_post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $plugin_post->get_error_message();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,12 +223,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'popular',
</span><span class="cx" style="display: block; padding: 0 10px"> 'new',
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'about',
+ 'admin',
+ 'wp-admin',
</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"> return in_array( $this->plugin_slug, $reserved_slugs );
</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">+ * Find the plugin readme file.
+ *
+ * Looks for either a readme.txt or readme.md file, prioritizing readme.txt.
+ *
+ * @return string The plugin readme.txt or readme.md filename.
+ */
+ protected function find_readme_file() {
+ $files = Filesystem::list_files( "{$this->plugin_dir}/{$this->plugin_slug}", false /* non-recursive */, '!^readme\.(txt|md)$!i' );
+
+ // Prioritize readme.txt
+ foreach ( $files as $file ) {
+ if ( '.txt' === strtolower( substr( $file, -4 ) ) ) {
+ return $file;
+ }
+ }
+
+ return reset( $files );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Sends a plugin through Plugin Check.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the plugin passed the checks.
</span></span></pre>
</div>
</div>
</body>
</html>