<!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>[14078] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-blueprint.php: Plugin Directory: Plugin check on upload: When running plugin check against an uploaded ZIP file, attempt to force the plugin to be installed into the expected folder path.</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/14078">14078</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/14078","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>2024-09-25 04:48:38 +0000 (Wed, 25 Sep 2024)</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: Plugin check on upload: When running plugin check against an uploaded ZIP file, attempt to force the plugin to be installed into the expected folder path.
This resolves issues of plugin check suggesting that the textdomain should be `2024_09_25-uploaded-file-SLUG` rather than `SLUG`.
This is intended on being temporary until the upstream issue is resolved.
See <a href="http://meta.trac.wordpress.org/ticket/7405">#7405</a>.
See https://github.com/WordPress/wordpress-playground/issues/1802.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginblueprintphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-blueprint.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginblueprintphp"></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/api/routes/class-plugin-blueprint.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/api/routes/class-plugin-blueprint.php 2024-09-25 04:43:24 UTC (rev 14077)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-blueprint.php 2024-09-25 04:48:38 UTC (rev 14078)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,15 +194,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $helper_zip = self::get_zip_url_by_slug( 'playground-review-helper' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $helper_zip && $install_prh ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $steps[] = (object)[
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'step' => 'installPlugin',
- 'pluginZipFile' => [
- 'resource' => 'url',
- 'url' => $helper_zip,
- ],
- 'options' => (object)[
- 'activate' => (bool)$activate_plugin
- ]
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'step' => 'installPlugin',
+ 'pluginZipFile' => [
+ 'resource' => 'url',
+ 'url' => $helper_zip,
+ ],
+ 'options' => (object)[
+ 'activate' => (bool)$activate_plugin
+ ]
+ ];
</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"> // Dependencies next
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,22 +223,56 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now the plugin itself
</span><span class="cx" style="display: block; padding: 0 10px"> $steps[] = (object)[
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'step' => 'installPlugin',
- 'pluginZipFile' => (object)[
- 'resource' => 'url',
- 'url' => $zip_url,
- ],
- 'options' => (object)[
- 'activate' => (bool)$activate_plugin
- ]
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'step' => 'installPlugin',
+ 'pluginZipFile' => (object)[
+ 'resource' => 'url',
+ 'url' => $zip_url,
+ ],
+ 'options' => (object)[
+ 'activate' => (bool)$activate_plugin
+ ]
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Maybe rename the plugin to exist in the expected folder.
+ *
+ * Temporary workaround for https://github.com/WordPress/wordpress-playground/issues/1802
+ */
+ if ( ! str_starts_with( 'https://downloads.wordpress.org/', $zip_url ) ) {
+ $steps[] = (object)[
+ 'step' => 'runPHP',
+ 'code' => '<?php
+ include "/wordpress/wp-load.php";
+ $expected_slug = ' . var_export( $plugin->post_name, true ) . ';
+ $expected_plugins = ' . var_export( array_merge( [ 'plugin-check', 'playground-review-helper' ], $dependencies ), true ) . ';
+ $installed_plugins = array_diff(
+ array_map( "basename", glob( WP_PLUGIN_DIR . "/*", GLOB_ONLYDIR ) ),
+ $expected_plugins
+ );
+ if ( 1 === count( $installed_plugins) ) {
+ $plugin_dir = reset( $installed_plugins );
+ if ( $plugin_dir !== $expected_slug ) {
+ if ( rename( WP_PLUGIN_DIR . "/" . $plugin_dir, WP_PLUGIN_DIR . "/" . $expected_slug ) ) {
+ $active_plugins = get_option( "active_plugins" );
+ foreach ( $active_plugins as &$active_plugin ) {
+ if ( 0 === strpos( $active_plugin, $plugin_dir ) ) {
+ $active_plugin = $expected_slug . substr( $active_plugin, strlen( $plugin_dir ) );
+ }
+ }
+ update_option( "active_plugins", $active_plugins );
+ }
+ }
+ }
+ '
+ ];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Finally log in
</span><span class="cx" style="display: block; padding: 0 10px"> $steps[] = (object)[
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'step' => 'login',
- 'username' => 'admin',
- 'password' => 'password',
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'step' => 'login',
+ 'username' => 'admin',
+ 'password' => 'password',
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $zip_blueprint->steps = $steps;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>