Changeset 3782

Timestamp:

08/08/2016 12:23:26 AM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Don't append tested version when it's within the last four releases.

Fixes a bug where the tested-up-to version was only compared with older
releases in the latest four branches and not the most current one when
determining whether the version needs to be appended or not.

Props joelcj91 for initial patch.
Fixes #1792.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-controls.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-controls.php

@@ -127 +127 @@
      * the current version the plugin is marked as tested with.
      *
+     * @global string $wp_version The WordPress version string.
+     *
      * @param string $tested_up_to The version which the plugin is currently specified as compatible to.
-     *
      * @return array An array containing 'versions' an array of versions for display, and 'tested_up_to'
      *               the sanitized/most recent version of the $tested_up_to parameter.
@@ -134 +135 @@
     protected static function get_tested_up_to_versions( $tested_up_to ) {
         global $wp_version;
+
         // Fetch all "compatible" versions, this array is in the form of [ '4.4.2' => [ '4.4.1', '4.4' ], ...]
         if ( function_exists( 'wporg_get_version_equivalents' ) ) {
+
             // This function is a global WordPress.org function.
             $all_versions = wporg_get_version_equivalents();
@@ -143 +146 @@
 
         $versions = array_slice( array_keys( $all_versions ), 0, 4 );
-        // WordPress.org runs trunk, this keeps the highest version selectable as trunk
-        $versions[5] = preg_replace( '!-\d{4,}$!', '', $wp_version );
 
-        $found = false;
         foreach( $versions as $version ) {
-            if ( isset( $all_versions[ $version ] ) && in_array( $tested_up_to, $all_versions[ $version ] ) ) {
+            if ( in_array( $tested_up_to, $all_versions[ $version ] ) ) {
                 $tested_up_to = $version;
-                $found = true;
                 break;
             }
         }
+
         // If the version specified isn't going to display, insert it into the list.
-        if ( ! $found ) {
-            $versions[4] = $tested_up_to;
-            ksort( $versions );
+        if ( ! in_array( $tested_up_to, $versions ) ) {
+            $versions[] = $tested_up_to;
         }
+
+        // WordPress.org runs trunk, this keeps the highest version selectable as trunk.
+        $versions[] = preg_replace( '!-\d{4,}$!', '', $wp_version );
 
         return compact( 'versions', 'tested_up_to' );
     }
 }
-