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

Timestamp:

07/13/2020 01:33:32 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Simplify compatibility checks for uploaded plugins and themes for better readability.

Use $new_plugin_data and $new_theme_data as a shorthand for the corresponding $this->upgrader properties.

Follow-up to [48390], [48448].

Props afragen.
See #9757.

File:

• trunk/src/wp-admin/includes/class-theme-installer-skin.php (modified) (8 diffs)

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

@@ -208 +208 @@
         }
 
-        if ( empty( $current_theme_data ) || empty( $this->upgrader->new_theme_data ) ) {
+        $new_theme_data = $this->upgrader->new_theme_data;
+
+        if ( ! $current_theme_data || ! $new_theme_data ) {
             return false;
         }
@@ -219 +221 @@
         }
 
-        $this->is_downgrading = version_compare( $current_theme_data['Version'], $this->upgrader->new_theme_data['Version'], '>' );
+        $this->is_downgrading = version_compare( $current_theme_data['Version'], $new_theme_data['Version'], '>' );
 
         $is_invalid_parent = false;
-        if ( ! empty( $this->upgrader->new_theme_data['Template'] ) ) {
-            $is_invalid_parent = ! in_array( $this->upgrader->new_theme_data['Template'], array_keys( $all_themes ), true );
+        if ( ! empty( $new_theme_data['Template'] ) ) {
+            $is_invalid_parent = ! in_array( $new_theme_data['Template'], array_keys( $all_themes ), true );
         }
 
@@ -244 +246 @@
             $old_value = $old_value ? (string) $old_value : '-';
 
-            $new_value = ! empty( $this->upgrader->new_theme_data[ $field ] ) ? (string) $this->upgrader->new_theme_data[ $field ] : '-';
+            $new_value = ! empty( $new_theme_data[ $field ] ) ? (string) $new_theme_data[ $field ] : '-';
 
             if ( $old_value === $new_value && '-' === $new_value && 'Template' === $field ) {
@@ -277 +279 @@
          * @param array  $new_theme_data     Array with uploaded theme data.
          */
-        echo apply_filters( 'install_theme_overwrite_comparison', $table, $current_theme_data, $this->upgrader->new_theme_data );
+        echo apply_filters( 'install_theme_overwrite_comparison', $table, $current_theme_data, $new_theme_data );
 
         $install_actions = array();
@@ -285 +287 @@
         $blocked_message .= '<ul class="ul-disc">';
 
-        if ( ! empty( $this->upgrader->new_theme_data['RequiresPHP'] )
-            && ! is_php_version_compatible( $this->upgrader->new_theme_data['RequiresPHP'] )
-        ) {
+        $requires_php = isset( $new_theme_data['RequiresPHP'] ) ? $new_theme_data['RequiresPHP'] : null;
+        $requires_wp  = isset( $new_theme_data['RequiresWP'] ) ? $new_theme_data['RequiresWP'] : null;
+
+        if ( ! is_php_version_compatible( $requires_php ) ) {
             $error = sprintf(
                 /* translators: 1: Current PHP version, 2: Version required by the uploaded theme. */
                 __( 'The PHP version on your server is %1$s, however the uploaded theme requires %2$s.' ),
                 phpversion(),
-                $this->upgrader->new_theme_data['RequiresPHP']
+                $requires_php
             );
 
@@ -299 +302 @@
         }
 
-        if ( ! empty( $this->upgrader->new_theme_data['RequiresWP'] )
-            && ! is_wp_version_compatible( $this->upgrader->new_theme_data['RequiresWP'] )
-        ) {
+        if ( ! is_wp_version_compatible( $requires_wp ) ) {
             $error = sprintf(
                 /* translators: 1: Current WordPress version, 2: Version required by the uploaded theme. */
                 __( 'Your WordPress version is %1$s, however the uploaded theme requires %2$s.' ),
-                $GLOBALS['wp_version'],
-                $this->upgrader->new_theme_data['RequiresWP']
+                get_bloginfo( 'version' ),
+                $requires_wp
             );
 
@@ -360 +361 @@
          * @param array    $new_theme_data  Array with uploaded theme data.
          */
-        $install_actions = apply_filters( 'install_theme_ovewrite_actions', $install_actions, $this->api, $this->upgrader->new_theme_data );
+        $install_actions = apply_filters( 'install_theme_ovewrite_actions', $install_actions, $this->api, $new_theme_data );
 
         if ( ! empty( $install_actions ) ) {
@@ -372 +373 @@
         return true;
     }
-
 }