<!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>[5727] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php: Plugin Directory: Prevent plugin slugs from clashing.</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/5727">5727</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/5727","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Otto42</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-07-31 20:51:48 +0000 (Mon, 31 Jul 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: Prevent plugin slugs from clashing. Fixes <a href="http://meta.trac.wordpress.org/ticket/3011">#3011</a>. props @SergeyBiryukov</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>
</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 2017-07-28 20:29:48 UTC (rev 5726)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php 2017-07-31 20:51:48 UTC (rev 5727)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'all_admin_notices', array( $this, 'admin_notices' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'display_post_states', array( $this, 'post_states' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_insert_post_data', array( $this, 'check_existing_plugin_slug_on_post_update' ), 10, 2 );
+ add_filter( 'wp_unique_post_slug', array( $this, 'check_existing_plugin_slug_on_inline_save' ), 10, 6 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_replyto-comment', array( $this, 'save_custom_comment' ), 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_row_actions', array( $this, 'custom_comment_row_actions' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_comment_link', array( $this, 'link_internal_notes_to_admin' ), 10, 2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,6 +315,64 @@
</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">+ * Check if a plugin with the provided slug already exists.
+ *
+ * Runs on 'wp_insert_post_data' when editing a plugin on Edit Plugin screen.
+ *
+ * @param array $data The data to be inserted into the database.
+ * @param array $postarr The raw data passed to `wp_insert_post()`.
+ * @return array The data to insert into the database.
+ */
+ function check_existing_plugin_slug_on_post_update( $data, $postarr ) {
+ if ( 'plugin' !== $data['post_type'] || ! isset( $postarr['ID'] ) ) {
+ return $data;
+ }
+
+ $existing_plugin = Plugin_Directory\Plugin_Directory::get_plugin_post( $data['post_name'] );
+
+ // Is there already a plugin with the same slug?
+ if ( $existing_plugin && $existing_plugin->ID != $postarr['ID'] ) {
+ wp_die( sprintf(
+ /* translators: %s: plugin slug */
+ __( 'Error: The plugin %s already exists.', 'wporg-plugins' ),
+ $data['post_name']
+ ) );
+ }
+
+ return $data;
+ }
+
+ /**
+ * Check if a plugin with the provided slug already exists.
+ *
+ * Runs on 'wp_unique_post_slug' when editing a plugin via Quick Edit.
+ *
+ * @param string $slug The unique post slug.
+ * @param int $post_ID Post ID.
+ * @param string $post_status Post status.
+ * @param string $post_type Post type.
+ * @param int $post_parent Post parent ID.
+ * @param string $original_slug The original post slug.
+ * @return string The unique post slug.
+ */
+ function check_existing_plugin_slug_on_inline_save( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
+ if ( 'plugin' !== $post_type ) {
+ return $slug;
+ }
+
+ // Did wp_unique_post_slug() change the slug to avoid a conflict?
+ if ( $slug !== $original_slug ) {
+ wp_die( sprintf(
+ /* translators: %s: plugin slug */
+ __( 'Error: The plugin %s already exists.', 'wporg-plugins' ),
+ $original_slug
+ ) );
+ }
+
+ return $slug;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Register the Admin metaboxes for the plugin management screens.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type The post type of the current screen.
</span></span></pre>
</div>
</div>
</body>
</html>