Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified plugins/woocommerce/assets/js/flexslider/jquery.flexslider.js
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified plugins/woocommerce/assets/js/photoswipe/photoswipe.js
100644 → 100755
Empty file.
Empty file modified plugins/woocommerce/assets/js/photoswipe/photoswipe.min.js
100644 → 100755
Empty file.
392 changes: 196 additions & 196 deletions plugins/woocommerce/i18n/languages/woocommerce.pot

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ private static function output_tables_info() {
private static function output_plugins_info( $plugins, $untested_plugins ) {
$wc_version = Constants::get_constant( 'WC_VERSION' );

if ( 'major' === WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE ) {
if ( 'major' === Constants::get_constant( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE' ) ) {
// Since we're only testing against major, we don't need to show minor and patch version.
$wc_version = $wc_version[0] . '.0';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,15 @@ protected function get_extensions_modal_warning() {
* with the $new_version.
*
* @param string $new_version WooCommerce version to test against.
* @param string $release 'major' or 'minor'.
* @param string $release 'major', 'minor', or 'none'.
* @return array of plugin info arrays
*/
public function get_untested_plugins( $new_version, $release ) {
// Since 5.0 all versions are backwards compatible.
if ( 'none' === $release ) {
return array();
}

$extensions = array_merge( $this->get_plugins_with_header( self::VERSION_TESTED_HEADER ), $this->get_plugins_for_woocommerce() );
$untested = array();
$new_version_parts = explode( '.', $new_version );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,14 @@ public function __construct() {
* @param stdClass $response Plugin update response.
*/
public function in_plugin_update_message( $args, $response ) {
$version_type = Constants::get_constant( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE' );
if ( ! is_string( $version_type ) ) {
$version_type = 'none';
}

$this->new_version = $response->new_version;
$this->upgrade_notice = $this->get_upgrade_notice( $response->new_version );
$this->major_untested_plugins = $this->get_untested_plugins( $response->new_version, 'major' );
$this->major_untested_plugins = $this->get_untested_plugins( $response->new_version, $version_type );

$current_version_parts = explode( '.', Constants::get_constant( 'WC_VERSION' ) );
$new_version_parts = explode( '.', $this->new_version );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
?>
<div id="wc_untested_extensions_modal">
<div class="wc_untested_extensions_modal--content">
<h1><?php esc_html_e( "This is a major update, are you sure you're ready?", 'woocommerce' ); ?></h1>
<h1><?php esc_html_e( "Are you sure you're ready?", 'woocommerce' ); ?></h1>
<div class="wc_plugin_upgrade_notice extensions_warning">
<p><?php echo esc_html( $untested_plugins_msg ); ?></p>

Expand All @@ -41,7 +41,7 @@
</table>
</div>

<p><?php esc_html_e( 'As this is a major update, we strongly recommend creating a backup of your site before updating.', 'woocommerce' ); ?> <a href="https://woocommerce.com/2017/05/create-use-backups-woocommerce/" target="_blank"><?php esc_html_e( 'Learn more', 'woocommerce' ); ?></a></p>
<p><?php esc_html_e( 'We strongly recommend creating a backup of your site before updating.', 'woocommerce' ); ?> <a href="https://woocommerce.com/2017/05/create-use-backups-woocommerce/" target="_blank"><?php esc_html_e( 'Learn more', 'woocommerce' ); ?></a></p>

<?php if ( current_user_can( 'update_plugins' ) ) : ?>
<div class="actions">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

if ( ! defined( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE' ) ) {
// Define if we're checking against major or minor versions.
define( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE', 'major' );
// Since 5.0 all versions are backwards compatible, so there's no more check.
define( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE', 'none' );
}

$report = wc()->api->get_endpoint_data( '/wc/v3/system_status' );
Expand Down
21 changes: 6 additions & 15 deletions plugins/woocommerce/includes/class-wc-emails.php
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function __construct() {
$this->init();

// Email Header, Footer and content hooks.
add_action( 'woocommerce_email_header', array( $this, 'email_header' ), 10, 2 );
add_action( 'woocommerce_email_header', array( $this, 'email_header' ) );
add_action( 'woocommerce_email_footer', array( $this, 'email_footer' ) );
add_action( 'woocommerce_email_order_details', array( $this, 'order_downloads' ), 10, 4 );
add_action( 'woocommerce_email_order_details', array( $this, 'order_details' ), 10, 4 );
Expand Down Expand Up @@ -263,26 +263,17 @@ public function get_from_address() {
/**
* Get the email header.
*
* @param mixed $email_heading Heading for the email.
* @param WC_Email $email Email object for the email.
* @param mixed $email_heading Heading for the email.
*/
public function email_header( $email_heading, $email ) {
wc_get_template(
'emails/email-header.php',
array(
'email_heading' => $email_heading,
'email' => $email,
)
);
public function email_header( $email_heading ) {
wc_get_template( 'emails/email-header.php', array( 'email_heading' => $email_heading ) );
}

/**
* Get the email footer.
*
* @param WC_Email $email Email object for the email.
*/
public function email_footer( $email ) {
wc_get_template( 'emails/email-footer.php', array( 'email' => $email ) );
public function email_footer() {
wc_get_template( 'emails/email-footer.php' );
}

/**
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/includes/class-woocommerce.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class WooCommerce {
*
* @var string
*/
public $version = '4.9.0';
public $version = '4.9.2';

/**
* WooCommerce Schema version.
Expand Down
6 changes: 4 additions & 2 deletions plugins/woocommerce/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: e-commerce, store, sales, sell, woo, shop, cart, checkout, downloadable, d
Requires at least: 5.3
Tested up to: 5.6
Requires PHP: 7.0
Stable tag: 4.9.0
Stable tag: 4.9.2
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -160,7 +160,9 @@ WooCommerce comes with some sample data you can use to see how products look; im

== Changelog ==

= 4.9.0 - 2021-01-xx =
= 4.9.2 2021-01-25 =

* Tweak - Disable untested plugin's notice from System Status and Plugin's page. #28840

[See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce/master/changelog.txt).

Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit324ab71ddd6ce9d2b4235222158cda48::getLoader();
return ComposerAutoloaderInitdb897b9c8e0c5079b17448f17a52683a::getLoader();
2 changes: 1 addition & 1 deletion plugins/woocommerce/vendor/autoload_packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader
*/

namespace Automattic\Jetpack\Autoloader\jp324ab71ddd6ce9d2b4235222158cda48;
namespace Automattic\Jetpack\Autoloader\jpdb897b9c8e0c5079b17448f17a52683a;

// phpcs:ignore

Expand Down
4 changes: 2 additions & 2 deletions plugins/woocommerce/vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see https://www.php-fig.org/psr/psr-0/
* @see https://www.php-fig.org/psr/psr-4/
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
Expand Down
Loading