Changeset 13726

Timestamp:

05/17/2024 04:15:37 AM (2 months ago)

Author:

dd32

Message:

Plugin Directory: Import: When importing from SVN, if the plugin specifies a Stable Tag that does not exist, and we fall back to trunk, warn them.

See #6380, #6108.
Fixes #5645.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• cli/class-import.php (modified) (1 diff)
• readme/class-validator.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -629 +629 @@
         }
 
+
         if ( ! $svn_info || ! $svn_info['result'] ) {
-            $stable_tag = 'trunk';
-            $stable_url = self::PLUGIN_SVN_BASE . "/{$plugin_slug}/trunk";
-            $svn_info   = SVN::info( $stable_url );
-        }
+            if ( 'trunk' !== $stable_tag ) {
+                $this->warnings['stable_tag_invalid_trunk_fallback'] = $stable_tag;
+                $this->warnings['stable_tag_invalid']                = true;
+            }
+
+            $stable_tag = 'trunk';
+            $stable_url = self::PLUGIN_SVN_BASE . "/{$plugin_slug}/trunk";
+            $svn_info   = SVN::info( $stable_url );
+        }
 
         if ( ! $svn_info['result'] ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php

@@ -297 +297 @@
                     __( 'The %1$s field is missing or invalid.  Note: We ask you no longer attempt to use %2$s as stable, so that all plugins can be rolled back.', 'wporg-plugins' ),
                     '<code>Stable tag</code>',
+
+
+
+
+
+
+
+
                     '<code>/trunk/</code>'
                 );