diff --git a/wp-admin/customize.php b/wp-admin/customize.php index 4954ca99ba..4bee7ebcf7 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -171,17 +171,33 @@ do_action( 'customize_controls_print_styles' ); * @since 3.4.0 */ do_action( 'customize_controls_print_scripts' ); + +// Need to use \ReflectionObject as $wp_customize->theme is protected class. +$reflection_obj = new \ReflectionObject( $wp_customize ); +$reflection_theme = $reflection_obj->getProperty( 'theme' ); +$reflection_theme->setAccessible( true ); +$customize_theme = $reflection_theme->getValue( $wp_customize ); +$wp_compatible = is_wp_version_compatible( $customize_theme->get( 'RequiresWP' ) ); +$php_compatible = is_php_version_compatible( $customize_theme->get( 'RequiresPHP' ) ); + ?>
- is_theme_active() ? __( 'Publish' ) : __( 'Activate & Publish' ); ?> -
- - -
+ + is_theme_active() ? __( 'Publish' ) : __( 'Activate & Publish' ); ?> +
+ + +
+ + is_theme_active() ? __( 'Publish' ) : __( 'Activate & Publish' ); ?> +
+ +
+ <# if ( data.installed ) { #> - - <# } else { #> - + <# if ( data.wp_compatible && data.php_compatible ) { #> + + <# } else { #> + + <# } #> + <# } else { #> + <# #> + + <# #> + + <# #> <# } #>
diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 53bb1049a7..f7b03d675f 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -323,10 +323,14 @@ foreach ( $themes as $theme ) :
- -

Update now' ); ?>

+ + +

Update now' ); ?>

+ +

+ -

+

@@ -358,10 +362,15 @@ foreach ( $themes as $theme ) : /* translators: %s: Theme name. */ $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); ?> - - - - + + + + + + + + +
@@ -488,10 +497,16 @@ if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes ) { <# } #> <# if ( data.hasUpdate ) { #> - <# if ( data.hasPackage ) { #> -

Update now' ); ?>

+ <# if ( data.wp_compatible && data.php_compatible ) { #> +
+ <# if ( data.hasPackage ) { #> +

Update now' ); ?>

+ <# } else { #> +

+ <# } #> <# } else { #> -

+
+

<# } #> <# } #> @@ -522,8 +537,13 @@ if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes ) { /* translators: %s: Theme name. */ $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); ?> - - + <# if ( data.wp_compatible && data.php_compatible ) { #> + + + <# } else { #> + + + <# } #> <# } #>
@@ -565,8 +585,18 @@ if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes ) { <# if ( data.hasUpdate ) { #>
-

- {{{ data.update }}} + <# if ( data.wp_compatible && data.php_compatible ) { #> +

+ {{{ data.update }}} + <# } else { #> +

+

+ <# } #>
<# } #>

{{{ data.description }}}

@@ -596,10 +626,13 @@ if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes ) { /* translators: %s: Theme name. */ $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); ?> - <# if ( data.actions.activate ) { #> + <# if ( data.actions.activate && data.wp_compatible && data.php_compatible ) { #> + + <# } else { #> + + <# } #> - <# if ( ! data.active && data.actions['delete'] ) { #> diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 9d21ac8c2c..b147fa363f 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -479,17 +479,36 @@ function list_theme_updates() { $theme ) { - $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) ); + $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) ); + $compatible_php = is_php_version_compatible( $theme->get( 'RequiresPHP' ) ); + $compat = ''; + $annotation = ''; + if ( ! $compatible_php && current_user_can( 'update_php' ) ) { + $compat .= '
' . __( 'This update doesn’t work with your version of PHP.' ) . ' '; + $compat .= sprintf( + /* translators: %s: URL to Update PHP page. */ + __( 'Learn more about updating PHP.' ), + esc_url( wp_get_update_php_url() ) + ); + + $annotation = wp_get_update_php_annotation(); + + if ( $annotation ) { + $compat .= '

' . $annotation . ''; + } + } ?> - - + + + +

@@ -501,6 +520,7 @@ function list_theme_updates() { $theme->display( 'Version' ), $theme->update['new_version'] ); + echo $compat . $annotation; ?>

diff --git a/wp-includes/customize/class-wp-customize-theme-control.php b/wp-includes/customize/class-wp-customize-theme-control.php index 10f09d180b..5dd0873d40 100644 --- a/wp-includes/customize/class-wp-customize-theme-control.php +++ b/wp-includes/customize/class-wp-customize-theme-control.php @@ -90,21 +90,29 @@ class WP_Customize_Theme_Control extends WP_Customize_Control { <# if ( 'installed' === data.theme.type && data.theme.hasUpdate ) { #> -
-

- ' . __( 'Update now' ) . '' - ); - } - ?> -

-
+ <# if ( data.theme.wp_compatible && data.theme.php_compatible ) { #> +
+

+ ' . __( 'Update now' ) . '' + ); + } + ?> +

+
+ <# } else { #> +
+

+ +

+
+ <# } #> <# } #> <# if ( data.theme.active ) { #> @@ -121,7 +129,11 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {

{{ data.theme.name }}

- + <# if ( data.theme.wp_compatible && data.theme.php_compatible ) { #> + + <# } else { #> + + <# } #>