Changeset 38459 for trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

Timestamp:

08/31/2016 05:48:49 AM (8 years ago)

Author:

wonderboymusic

Message:

General: use get_bloginfo( 'version' ) instead of global $wp_version in several locations - excluding those locations which reload version.php mid-flight.

See #37699.

File:

• trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -70 +70 @@
      * @global string $type
      * @global string $term
-     * @global string $wp_version
      */
     public function prepare_items() {
@@ -89 +88 @@
             $tabs['search'] = __( 'Search Results' );
         }
-        if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+        if ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
             $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
         }
@@ -392 +391 @@
     }
 
-    /**
-     * @global string $wp_version
-     */
     public function display_rows() {
         $plugins_allowedtags = array(
@@ -575 +571 @@
                 <div class="column-compatibility">
                     <?php
-                    if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
+                    $wp_version = get_bloginfo( 'version' );
+
+                    if ( ! empty( $plugin['tested'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
                         echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
-                    } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
+                    } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
                         echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
                     } else {