Changeset 48448

Timestamp:

07/12/2020 10:53:36 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Use is_php_version_compatible() and is_wp_version_compatible() in plugin and theme requirement checks.

Follow-up to [48390].

Props afragen.
See #9757.

Location:

trunk/src/wp-admin/includes

Files:

• class-plugin-installer-skin.php (modified) (3 diffs)
• class-theme-installer-skin.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-plugin-installer-skin.php

@@ -215 +215 @@
         $table .= '<th>' . esc_html( __( 'Uploaded' ) ) . '</th></tr>';
 
-        $is_same_plugin = true; // Let's consider only these rows
+        $is_same_plugin = true; // Let's consider only these rows.
+
         foreach ( $rows as $field => $label ) {
             $old_value = ! empty( $current_plugin_data[ $field ] ) ? $current_plugin_data[ $field ] : '-';
@@ -249 +250 @@
         $blocked_message .= '<ul class="ul-disc">';
 
-        if (
-            ! empty( $this->upgrader->new_plugin_data['RequiresPHP'] ) &&
-            version_compare( phpversion(), $this->upgrader->new_plugin_data['RequiresPHP'], '<' )
+        if ( ! empty( $this->upgrader->new_plugin_data['RequiresPHP'] )
+            && ! is_php_version_compatible( $this->upgrader->new_plugin_data['RequiresPHP'] )
         ) {
             $error = sprintf(
@@ -264 +264 @@
         }
 
-        if (
-            ! empty( $this->upgrader->new_plugin_data['RequiresWP'] ) &&
-            version_compare( $GLOBALS['wp_version'], $this->upgrader->new_plugin_data['RequiresWP'], '<' )
+        if ( ! empty( $this->upgrader->new_plugin_data['RequiresWP'] )
+            && ! is_wp_version_compatible( $this->upgrader->new_plugin_data['RequiresWP'] )
         ) {
             $error = sprintf(

trunk/src/wp-admin/includes/class-theme-installer-skin.php

@@ -238 +238 @@
         $table .= '<tr><th></th><th>' . esc_html( __( 'Current' ) ) . '</th><th>' . esc_html( __( 'Uploaded' ) ) . '</th></tr>';
 
-        $is_same_theme = true; // Let's consider only these rows
+        $is_same_theme = true; // Let's consider only these rows.
+
         foreach ( $rows as $field => $label ) {
             $old_value = $current_theme_data->display( $field, false );
@@ -284 +285 @@
         $blocked_message .= '<ul class="ul-disc">';
 
-        if ( ! empty( $this->upgrader->new_theme_data['RequiresPHP'] ) && version_compare( phpversion(), $this->upgrader->new_theme_data['RequiresPHP'], '<' ) ) {
+        if ( ! empty( $this->upgrader->new_theme_data['RequiresPHP'] )
+            && ! is_php_version_compatible( $this->upgrader->new_theme_data['RequiresPHP'] )
+        ) {
             $error = sprintf(
                 /* translators: 1: Current PHP version, 2: Version required by the uploaded theme. */
@@ -296 +299 @@
         }
 
-        if ( ! empty( $this->upgrader->new_theme_data['RequiresWP'] ) && version_compare( $GLOBALS['wp_version'], $this->upgrader->new_theme_data['RequiresWP'], '<' ) ) {
+        if ( ! empty( $this->upgrader->new_theme_data['RequiresWP'] )
+            && ! is_wp_version_compatible( $this->upgrader->new_theme_data['RequiresWP'] )
+        ) {
             $error = sprintf(
                 /* translators: 1: Current WordPress version, 2: Version required by the uploaded theme. */