<!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>[9101] sites/trunk/wordpress.org/public_html/wp-content: Plugin Directory: Improve plugin submission page:</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/9101">9101</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/9101","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>2019-08-14 01:29:42 +0000 (Wed, 14 Aug 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'>Plugin Directory: Improve plugin submission page:
* Show upload form at the top, after a brief intro, to make errors easier to notice.
* Clarify upload error messages.
Props Ipstenu.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4674">#4674</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginspageaddphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/page-add.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2019-08-13 21:08:02 UTC (rev 9100)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2019-08-14 01:29:42 UTC (rev 9101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,12 +115,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure it doesn't use a TRADEMARK protected slug.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->has_trademarked_slug() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error = __( 'Error: The plugin has a trademarked name.', 'wporg-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error = __( 'Error: The plugin includes a trademarked name.', 'wporg-plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'trademarked_name', $error . ' ' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: plugin slug, 2: 'Plugin Name:', 3: plugin email address. */
- __( 'Your chosen plugin name - %1$s - has been flagged as trademark infringement and cannot be used. We have been legally compelled to protect specific trademarks and as such prevent the use of specific terms. Please change the %2$s line in your main plugin file and readme, then you may upload it again. If you feel this is in error, please email us at %3$s and explain why.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
+ __( 'Your chosen plugin name - %1$s - has been flagged for trademark infringement by containing the term "%2$s" and as such cannot be used. In order to comply with demands from trademark owners and to protect developers, we are disallowing the use of specific terms in plugin slugs entirely. Please change the %3$s line in your main plugin file and readme so that you may upload your plugin for review. If you feel this is in error, please email us at %4$s and explain why.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->plugin_slug . '</code>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->has_trademarked_slug(),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>Plugin Name:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>plugins@wordpress.org</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'already_exists', $error . ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin slug, 2: 'Plugin Name:' */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'There is already a plugin with the name %1$s in the directory. Please rename your plugin by changing the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'There is already a plugin with the name %1$s in the directory. You must rename your plugin by changing the %2$s line in your main plugin file and in your readme. Once you have done so, you may upload it again.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->plugin_slug . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Plugin Name:</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'already_submitted', $error . ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin slug, 2: Documentation URL, 3: plugins@wordpress.org */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You have already submitted a plugin named %1$s. There is no need to resubmit existing plugins, even for new versions. Simply update your plugin within the directory via <a href="%2$s">SVN</a>. If you need assistance, email <a href="mailto:%3$s">%3$s</a> and let us know.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You have already submitted a plugin named %1$s. There is no need to resubmit existing plugins, even for new versions. Simply update your plugin within the directory via <a href="%2$s">SVN</a>. If you need assistance, email <a href="mailto:%3$s">%3$s</a> and let us know. Make sure to include any error messages in your email.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->plugin_slug . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/plugins/wordpress-org/how-to-use-subversion/', 'wporg-plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugins@wordpress.org'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'trademarked_name', $error . ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin slug, 2: 'Plugin Name:' */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Your chosen plugin name - %1$s - is not permitted because it is too short. Please change the %2$s line in your main plugin file and readme and upload it again.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Your chosen plugin name - %1$s - is not permitted because it is too short. Please change the %2$s line in your main plugin file and readme to a different name. When you have finished, you may upload your plugin again.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->plugin_slug . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Plugin Name:</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'no_description', $error . ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin header line, 2: Documentation URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Add a %1$s line to your main plugin file and upload the plugin again. Please review our documentation on <a href="%2$s">Plugin Headers</a> for more information.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'We cannot find a description in your plugin headers. Please add a %1$s line to your main plugin file and upload the complete plugin again. If you need more information, please review our documentation on <a href="%2$s">Plugin Headers</a>.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>Description:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/plugins/the-basics/header-requirements/', 'wporg-plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'no_version', $error . ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin header line, 2: Documentation URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Add a %1$s line to your main plugin file and upload the plugin again. Please review our documentation on <a href="%2$s">Plugin Headers</a> for more information.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'We cannot find a version listed in your plugin headers. Please add a %1$s line to your main plugin file and upload the complete plugin again. If you need more information, please review our documentation on <a href="%2$s">Plugin Headers</a>.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>Version:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/plugins/the-basics/header-requirements/', 'wporg-plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $readme = new Parser( $readme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pass it through Plugin Check and see how great this plugin really is.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We're not actually using this right now
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We're not actually using this right now.
</ins><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="cx" style="display: block; padding: 0 10px"> if ( ! $result ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'failed_checks', $error . ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Plugin Check Plugin URL, 2: https://make.wordpress.org/plugins */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Please correct the problems with the plugin and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Please correct the listed problems with your plugin and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '//wordpress.org/plugins/plugin-check/',
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="https://make.wordpress.org/plugins">https://make.wordpress.org/plugins</a>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin name, 2: plugin slug, 3: plugins@wordpress.org */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. It has been given the initial plugin slug of %2$s, however that is subject to change based on the results of your code review. If this slug is incorrect, please contact us immediately, as it cannot be changed once your plugin is approved.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. Your plugin has been given the initial slug of %2$s, however that is subject to change based on the results of your code review. If this slug is incorrect, please contact us immediately, as it cannot be changed once your plugin is approved.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $this->plugin['Name'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->plugin_slug . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p><p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,26 +332,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether the uploaded plugin uses a reserved slug.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if the slug is reserved, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function has_reserved_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> $reserved_slugs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin Directory URL parameters.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'about',
+ 'admin',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'browse',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tag',
- 'search',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'developers',
+ 'developer',
+ 'featured',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload',
- 'featured',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'jquery',
+ 'new',
+ 'page',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'popular',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'new',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'search',
+ 'tag',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updated',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'about',
- 'developers',
- 'admin',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload',
+ 'wordpress',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wordpress',
- 'jquery',
</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"> return in_array( $this->plugin_slug, $reserved_slugs );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,19 +363,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether the uploaded plugin uses a trademark in the slug.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false The trademarked slug if found, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function has_trademarked_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> $trademarked_slugs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'contact-form-7',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'divi',
+ 'easy-digital-downloads',
+ 'elementor',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'facebook',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedburner',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'google',
</span><span class="cx" style="display: block; padding: 0 10px"> '-gram',
</span><span class="cx" style="display: block; padding: 0 10px"> 'gram-',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'gravity-forms',
+ 'gutenberg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'instagram',
</span><span class="cx" style="display: block; padding: 0 10px"> 'insta',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'macintosh',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'microsoft',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'paypal',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ninja-forms',
+ 'pinterest',
+ 'samsung',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'twitter',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tweet',
</span><span class="cx" style="display: block; padding: 0 10px"> 'whatsapp',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,6 +392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'woocommerce',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress',
</span><span class="cx" style="display: block; padding: 0 10px"> 'yoast',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'youtube',
</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"> $has_trademarked_slug = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $trademarked_slugs as $trademark ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $this->plugin_slug, $trademark ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_trademarked_slug = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_trademarked_slug = $trademark;
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,10 +496,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Your plugin has been given the initial slug of %2$s based on your display name of %1$s. This is subject to change based on the results of your review.
</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 there are any problems with your submission, please REPLY to this email and let us know right away. In most cases, we can correct errors as long as the plugin has not yet been approved. For situations like an incorrect plugin slug, we are unable to change that post approval. If you do not inform us of any requirements now, we will be unable to honor them later.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+If you need to change the plugin slug, please reply to this email immediately and let us know, otherwise we will be unable to do so later.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-We recommend you review the following links to understand the review process and our expectations:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+If there are any other problems with your submission, please reply to this email and let us know right away. In most cases, we can correct errors as long as the plugin has not yet been approved.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+We remind you review the following links to understand the review process and our expectations:
+
</ins><span class="cx" style="display: block; padding: 0 10px"> Guidelines: https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/
</span><span class="cx" style="display: block; padding: 0 10px"> Frequently Asked Questions: https://developer.wordpress.org/plugins/wordpress-org/plugin-developer-faq/
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginspageaddphp"></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/themes/pub/wporg-plugins/page-add.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/themes/pub/wporg-plugins/page-add.php 2019-08-13 21:08:02 UTC (rev 9100)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/page-add.php 2019-08-14 01:29:42 UTC (rev 9101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,60 +24,55 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <section>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="container">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 id="faq"><?php esc_html_e( 'FAQ', 'wporg-plugins' ); ?></h2>
-
- <h3><?php esc_html_e( 'How long will the review process take?', 'wporg-plugins' ); ?></h3>
</del><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: URL to plugin developer FAQ. */
- wp_kses_post( __( 'This is in the <a href="%s">Developer FAQ</a>. It takes anywhere between 1 and 10 days. We attempt to review all plugins within 5 business days of submission, but the process takes as long as it takes, depending on the complexity of your plugin.', 'wporg-plugins' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: URL to plugin guidelines, 2: URL to plugin developer FAQ. */
+ wp_kses_post( __( 'Before you submit your plugin, we ask you to review our <a href="%1$s">Guidelines</a> and read the <a href="%2$s">Frequently Asked Questions</a>. A brief selections of common questions are listed below the form.', 'wporg-plugins' ) ),
+ esc_url( 'https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( 'https://developer.wordpress.org/plugins/wordpress-org/plugin-developer-faq/' )
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php esc_html_e( 'What will my plugin URL be?', 'wporg-plugins' ); ?></h3>
- <p><?php echo wp_kses_post( __( 'Your plugin’s URL will be populated based on the value of <code>Plugin Name</code> in your main plugin file (the one with the plugin headers). If you set yours as <code>Plugin Name: Boaty McBoatface</code> then your URL will be <code>https://wordpress.org/plugins/boaty-mcboatface</code> and your slug will be <code>boaty-mcboatface</code> for example. If there is an existing plugin with your name, then you will be <code>boaty-mcboatface-2</code> and so on. It behaves exactly like WordPress post names.', 'wporg-plugins' ) ); ?></p>
- <p><?php echo wp_kses_post( __( 'Once your plugin is approved, it <em>cannot</em> be renamed.', 'wporg-plugins' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo do_shortcode( '[wporg-plugin-upload]' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php esc_html_e( 'I made a mistake in my plugin name. Should I resubmit?', 'wporg-plugins' ); ?></h3>
- <p><?php echo wp_kses_post( __( 'Please don’t! Instead email <code>plugins@wordpress.org</code> and we can rename your plugin as long as it’s not approved. Since we check emails first, the odds are we’ll catch it. If we don’t, just email us and explain the mistake. We’ll explain what to do.', 'wporg-plugins' ) ); ?></p>
-
- <h3><?php esc_html_e( 'Why was I told my plugin name was unacceptable?', 'wporg-plugins' ); ?></h3>
</del><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: URL to plugin guidelines. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_kses_post( __( 'This is explained in detail in our <a href="%s">detailed plugin guidelines</a>, but currently we give you the chance to rename it during the review process if the plugin name violates the guideline. Some terms (like “plugin” and “WordPress”) will be removed for you, as those should not be used at all. We get it; you’re a WordPress Plugin.', 'wporg-plugins' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_post( __( 'Once submitted, your plugin will be manually reviewed for any common errors as well as ensuring it complies with <a href="%s">all the guidelines</a>.', 'wporg-plugins' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( 'https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/' )
</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"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php echo wp_kses_post( __( 'Regarding the names and trademarks of other companies and plugins, don’t use them at the start of your plugin name. If you’re not Facebook, you shouldn’t submit a plugin that uses <code>facebook</code> as the first term in your slug. “Facebook Like Sharer” (which would be <code>facebook-like-sharer</code>) is not acceptable, but “Like Sharer for Facebook” (which would be <code>like-sharer-for-facebook</code>) would be alright.', 'wporg-plugins' ) ); ?></p>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </section>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <section>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="container">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 id="faq"><?php esc_html_e( 'Frequently Asked Questions', 'wporg-plugins' ); ?></h2>
+
+ <h3><?php esc_html_e( 'How long will the review process take?', 'wporg-plugins' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: URL to plugin guidelines. */
- wp_kses_post( __( 'Once submitted, your plugin will be manually reviewed for any common errors as well as ensuring it complies with <a href="%s">all the guidelines</a>.', 'wporg-plugins' ) ),
- esc_url( 'https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: URL to plugin developer FAQ. */
+ wp_kses_post( __( 'This is in the <a href="%s">Developer FAQ</a>. It takes anywhere between 1 and 10 days. We attempt to review all plugins within 5 business days of submission, but the process takes as long as it takes, depending on the complexity of your plugin.', 'wporg-plugins' ) ),
+ esc_url( 'https://developer.wordpress.org/plugins/wordpress-org/plugin-developer-faq/' )
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo do_shortcode( '[wporg-plugin-upload]' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php esc_html_e( 'What will my plugin URL be?', 'wporg-plugins' ); ?></h3>
+ <p><?php echo wp_kses_post( __( 'Your plugin’s URL will be populated based on the value of <code>Plugin Name</code> in your main plugin file (the one with the plugin headers). If you set yours as <code>Plugin Name: Boaty McBoatface</code> then your URL will be <code>https://wordpress.org/plugins/boaty-mcboatface</code> and your slug will be <code>boaty-mcboatface</code> for example. If there is an existing plugin with your name, then you will be <code>boaty-mcboatface-2</code> and so on. It behaves exactly like WordPress post names.', 'wporg-plugins' ) ); ?></p>
+ <p><?php echo wp_kses_post( __( 'Once your plugin is approved, it <em>cannot</em> be renamed.', 'wporg-plugins' ) ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Even if you’ve submitted a dozen plugins, take the time to refresh your memory with the following information:', 'wporg-plugins' ); ?>
- <ul>
- <li><a href="https://developer.wordpress.org/plugins/wordpress-org/how-to-use-subversion/"><?php esc_html_e( 'How to use SVN', 'wporg-plugins' ); ?></a></li>
- <li><a href="https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/"><?php esc_html_e( 'Plugin Assets (and how to use them)', 'wporg-plugins' ); ?></a></li>
- <li><a href="https://developer.wordpress.org/plugins/wordpress-org/plugin-developer-faq/"><?php esc_html_e( 'Developer FAQ', 'wporg-plugins' ); ?></a></li>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php esc_html_e( 'I made a mistake in my plugin name. Should I resubmit?', 'wporg-plugins' ); ?></h3>
+ <p><?php echo wp_kses_post( __( 'Please don’t! Instead email <code>plugins@wordpress.org</code> and we can rename your plugin as long as it’s not approved. Since we check emails first, the odds are we’ll catch it. If we don’t, just email us and explain the mistake. We’ll explain what to do.', 'wporg-plugins' ) ); ?></p>
+
+ <h3><?php esc_html_e( 'Why can\'t I submit a plugin with certain display names?', 'wporg-plugins' ); ?></h3>
+ <p><?php echo wp_kses_post( __( 'Certain plugin names are prohibited due to trademark abuse. Similarly, we prevent their use in plugin slugs entirely for your protection.', 'wporg-plugins' ) ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </section>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span></span></pre>
</div>
</div>
</body>
</html>