Changeset 3212

Timestamp:

05/23/2016 02:37:35 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: ZIPs: Handle stable_tag's which are set to things like .12.3 rather than the expected 0.12.3.

See #1578

Location:

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

Files:

• class-readme-parser.php (modified) (1 diff)
• cli/class-import.php (modified) (1 diff)
• zip/class-builder.php (modified) (1 diff)

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

@@ -385 +385 @@
         $stable_tag = preg_replace( '![^a-z0-9_.-]!i', '', $stable_tag );
 
+        // If the stable_tag begins with a ., we treat it as 0.blah
+        if ( '.' == substr( $stable_tag, 0, 1 ) ) {
+            $stable_tag = "0{$stable_tag}";
+        }
+
         return $stable_tag;
     }

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

@@ -231 +231 @@
                 )
             );
+            // Handle tags which we store as 0.blah but are in /tags/.blah
+            if ( ! $svn_export['result'] && '0.' == substr( $stable_tag, 0, 2 ) ) {
+                $_stable_tag = substr( $stable_tag, 1 );
+                $svn_export = SVN::export(
+                    self::PLUGIN_SVN_BASE . "/{$plugin_slug}/tags/{$_stable_tag}",
+                    $tmp_dir . '/export',
+                    array(
+                        'ignore-externals',
+                        'depth' => 'files'
+                    )
+                );
+            }
             if ( $svn_export['result'] && false !== $this->find_readme_file( $tmp_dir . '/export' ) ) {
                 $exported = true;

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php

@@ -98 +98 @@
 
         $res = SVN::export( $svn_url, $build_dir, $svn_params );
+        // Handle tags which we store as 0.blah but are in /tags/.blah
+        if ( ! $res['result'] && '0.' == substr( $this->version, 0, 2 ) ) {
+            $_version = substr( $this->version, 1 );
+            $svn_url = self::SVN_URL . "/{$this->slug}/tags/{$_version}/";
+            $res = SVN::export( $svn_url, $build_dir, $svn_params );
+        }
         if ( ! $res['result'] ) {
             throw new Exception( __METHOD__ . ': ' . $res['errors'][0]['error_message'], 404 );