Updated constants' names to better reflect their usage.
This commit is contained in:
parent
cb12b30c85
commit
6727fdba62
|
@ -379,7 +379,7 @@ class WC_Admin_Notices {
|
||||||
* @since 3.6.5
|
* @since 3.6.5
|
||||||
*/
|
*/
|
||||||
public static function add_min_version_notice() {
|
public static function add_min_version_notice() {
|
||||||
if ( version_compare( phpversion(), WC_MIN_PHP_VERSION, '<' ) || version_compare( get_bloginfo( 'version' ), WC_MIN_WP_VERSION, '<' ) ) {
|
if ( version_compare( phpversion(), WC_NOTICE_MIN_PHP_VERSION, '<' ) || version_compare( get_bloginfo( 'version' ), WC_NOTICE_MIN_WP_VERSION, '<' ) ) {
|
||||||
self::add_notice( 'wp_php_min_requirements' );
|
self::add_notice( 'wp_php_min_requirements' );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -396,8 +396,8 @@ class WC_Admin_Notices {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$old_php = version_compare( phpversion(), WC_MIN_PHP_VERSION, '<' );
|
$old_php = version_compare( phpversion(), WC_NOTICE_MIN_PHP_VERSION, '<' );
|
||||||
$old_wp = version_compare( get_bloginfo( 'version' ), WC_MIN_WP_VERSION, '<' );
|
$old_wp = version_compare( get_bloginfo( 'version' ), WC_NOTICE_MIN_WP_VERSION, '<' );
|
||||||
|
|
||||||
// Both PHP and WordPress up to date version => no notice.
|
// Both PHP and WordPress up to date version => no notice.
|
||||||
if ( ! $old_php && ! $old_wp ) {
|
if ( ! $old_php && ! $old_wp ) {
|
||||||
|
@ -408,20 +408,20 @@ class WC_Admin_Notices {
|
||||||
$msg = sprintf(
|
$msg = sprintf(
|
||||||
/* translators: 1: Minimum PHP version 2: Minimum WordPress version */
|
/* translators: 1: Minimum PHP version 2: Minimum WordPress version */
|
||||||
__( 'Update required: WooCommerce will soon require PHP version %1$s and WordPress version %2$s or newer.', 'woocommerce' ),
|
__( 'Update required: WooCommerce will soon require PHP version %1$s and WordPress version %2$s or newer.', 'woocommerce' ),
|
||||||
WC_MIN_PHP_VERSION,
|
WC_NOTICE_MIN_PHP_VERSION,
|
||||||
WC_MIN_WP_VERSION
|
WC_NOTICE_MIN_WP_VERSION
|
||||||
);
|
);
|
||||||
} elseif ( $old_php ) {
|
} elseif ( $old_php ) {
|
||||||
$msg = sprintf(
|
$msg = sprintf(
|
||||||
/* translators: %s: Minimum PHP version */
|
/* translators: %s: Minimum PHP version */
|
||||||
__( 'Update required: WooCommerce will soon require PHP version %s or newer.', 'woocommerce' ),
|
__( 'Update required: WooCommerce will soon require PHP version %s or newer.', 'woocommerce' ),
|
||||||
WC_MIN_PHP_VERSION
|
WC_NOTICE_MIN_PHP_VERSION
|
||||||
);
|
);
|
||||||
} elseif ( $old_wp ) {
|
} elseif ( $old_wp ) {
|
||||||
$msg = sprintf(
|
$msg = sprintf(
|
||||||
/* translators: %s: Minimum WordPress version */
|
/* translators: %s: Minimum WordPress version */
|
||||||
__( 'Update required: WooCommerce will soon require WordPress version %s or newer.', 'woocommerce' ),
|
__( 'Update required: WooCommerce will soon require WordPress version %s or newer.', 'woocommerce' ),
|
||||||
WC_MIN_WP_VERSION
|
WC_NOTICE_MIN_WP_VERSION
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -228,8 +228,8 @@ final class WooCommerce {
|
||||||
$this->define( 'WC_LOG_DIR', $upload_dir['basedir'] . '/wc-logs/' );
|
$this->define( 'WC_LOG_DIR', $upload_dir['basedir'] . '/wc-logs/' );
|
||||||
$this->define( 'WC_SESSION_CACHE_GROUP', 'wc_session_id' );
|
$this->define( 'WC_SESSION_CACHE_GROUP', 'wc_session_id' );
|
||||||
$this->define( 'WC_TEMPLATE_DEBUG_MODE', false );
|
$this->define( 'WC_TEMPLATE_DEBUG_MODE', false );
|
||||||
$this->define( 'WC_MIN_PHP_VERSION', '5.6.20' );
|
$this->define( 'WC_NOTICE_MIN_PHP_VERSION', '5.6.20' );
|
||||||
$this->define( 'WC_MIN_WP_VERSION', '4.9' );
|
$this->define( 'WC_NOTICE_MIN_WP_VERSION', '4.9' );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue