Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-26 13:39:20 +01:00
Code Issues Projects Releases Wiki Activity

PHPCS: Fix WPCS violations in [44978].

Browse Source 
See .
Built from https://develop.svn.wordpress.org/trunk@44979


git-svn-id: http://core.svn.wordpress.org/trunk@44810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-03-22 01:00:52 +00:00
parent 75a3e484ec
commit 8954465943
2 changed files with 22 additions and 10 deletions
wp-admin/includes
plugin.php
wp-includes
version.php

30
wp-admin/includes/plugin.php
View File

@ -1096,19 +1096,31 @@ function validate_plugin_requirements( $plugin ) {
$plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );
if ( ! $plugin_data['wp_compatible'] && ! $plugin_data['php_compatible'] ) {
return new WP_Error( 'plugin_wp_php_incompatible', sprintf(
/* translators: %s: plugin name */
__( '<strong>Error:</strong> Current WordPress and PHP versions do not meet minimum requirements for %s.' ), $plugin_data['Name'] )
return new WP_Error(
'plugin_wp_php_incompatible',
sprintf(
/* translators: %s: plugin name */
__( '<strong>Error:</strong> Current WordPress and PHP versions do not meet minimum requirements for %s.' ),
$plugin_data['Name']
)
);
} elseif ( ! $plugin_data['php_compatible'] ) {
return new WP_Error( 'plugin_php_incompatible', sprintf(
/* translators: %s: plugin name */
__( '<strong>Error:</strong> Current PHP version does not meet minimum requirements for %s.' ), $plugin_data['Name'] )
return new WP_Error(
'plugin_php_incompatible',
sprintf(
/* translators: %s: plugin name */
__( '<strong>Error:</strong> Current PHP version does not meet minimum requirements for %s.' ),
$plugin_data['Name']
)
);
} elseif ( ! $plugin_data['wp_compatible'] ) {
return new WP_Error( 'plugin_wp_incompatible', sprintf(
/* translators: %s: plugin name */
__( '<strong>Error:</strong> Current WordPress version does not meet minimum requirements for %s.' ), $plugin_data['Name'] )
return new WP_Error(
'plugin_wp_incompatible',
sprintf(
/* translators: %s: plugin name */
__( '<strong>Error:</strong> Current WordPress version does not meet minimum requirements for %s.' ),
$plugin_data['Name']
)
);
}

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.2-alpha-44978';
$wp_version = '5.2-alpha-44979';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.