From ee9e8389184d728ea79d0f5ae86407f40c6cf56f Mon Sep 17 00:00:00 2001 From: Denis Dvali Date: Wed, 22 Apr 2020 19:55:13 +0300 Subject: [PATCH 1/5] Reset plugin cache before retrieving plugin list on Subscriptions tab. --- includes/admin/helper/class-wc-helper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/admin/helper/class-wc-helper.php b/includes/admin/helper/class-wc-helper.php index 42500a0b983..e131b8e52e5 100644 --- a/includes/admin/helper/class-wc-helper.php +++ b/includes/admin/helper/class-wc-helper.php @@ -1149,6 +1149,8 @@ class WC_Helper { require_once ABSPATH . 'wp-admin/includes/plugin.php'; } + // Reset plugin cache before retrieving plugin list. + wp_clean_plugins_cache(); $plugins = get_plugins(); $woo_plugins = array(); From b62457dd0175b065ef871ad482ea278c9ad6e222 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 3 Apr 2020 18:12:08 -0300 Subject: [PATCH 2/5] Validate page template --- includes/class-wc-template-loader.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/includes/class-wc-template-loader.php b/includes/class-wc-template-loader.php index 7f0bdbcc4f0..28e0606f6b4 100644 --- a/includes/class-wc-template-loader.php +++ b/includes/class-wc-template-loader.php @@ -127,7 +127,16 @@ class WC_Template_Loader { $templates[] = 'woocommerce.php'; if ( is_page_template() ) { - $templates[] = get_page_template_slug(); + $page_template = get_page_template_slug(); + + if ( $page_template ) { + $validated_file = validate_file( $page_template ); + if ( 0 === $validated_file ) { + $templates[] = $page_template; + } else { + error_log( "WooCommerce: Unable to validate template path: \"$page_template\". Error Code: $validated_file." ); + } + } } if ( is_singular( 'product' ) ) { From 70ad0d0954a35d933da0f14a330814c280e2f090 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 29 Apr 2020 16:50:56 +0000 Subject: [PATCH 3/5] Update dependency woocommerce/action-scheduler to v3.1.5 --- composer.json | 2 +- composer.lock | 54 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index b2a52998c67..6976f0ea46f 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "composer/installers": "1.7.0", "maxmind-db/reader": "1.6.0", "pelago/emogrifier": "^3.1", - "woocommerce/action-scheduler": "3.1.4", + "woocommerce/action-scheduler": "3.1.5", "woocommerce/woocommerce-blocks": "2.5.16", "woocommerce/woocommerce-rest-api": "1.0.7", "woocommerce/woocommerce-admin": "1.1.0" diff --git a/composer.lock b/composer.lock index cc89f067ce9..b20080276eb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "70e106b80656344113dd6570f564b367", + "content-hash": "678668d06a12eae254dd92ed879b8a32", "packages": [ { "name": "automattic/jetpack-autoloader", @@ -379,20 +379,34 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-16T08:31:04+00:00" }, { "name": "woocommerce/action-scheduler", - "version": "3.1.4", + "version": "3.1.5", "source": { "type": "git", "url": "https://github.com/woocommerce/action-scheduler.git", - "reference": "5a01f0b549a283dc88c2feeef877650215907a76" + "reference": "84e8ecba7d4f542f85fae7663e90eede1858b41b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/woocommerce/action-scheduler/zipball/5a01f0b549a283dc88c2feeef877650215907a76", - "reference": "5a01f0b549a283dc88c2feeef877650215907a76", + "url": "https://api.github.com/repos/woocommerce/action-scheduler/zipball/84e8ecba7d4f542f85fae7663e90eede1858b41b", + "reference": "84e8ecba7d4f542f85fae7663e90eede1858b41b", "shasum": "" }, "require-dev": { @@ -414,7 +428,7 @@ ], "description": "Action Scheduler for WordPress and WooCommerce", "homepage": "https://actionscheduler.org/", - "time": "2020-03-18T15:05:10+00:00" + "time": "2020-04-29T16:19:22+00:00" }, { "name": "woocommerce/woocommerce-admin", @@ -2461,6 +2475,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-14T07:34:21+00:00" }, { @@ -2519,6 +2547,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-27T09:26:54+00:00" }, { From 276c293edc9c3c32d6eafc5f74b0e782af689406 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 29 Apr 2020 18:04:08 +0000 Subject: [PATCH 4/5] Update dependency woocommerce/woocommerce-admin to v1.1.1 --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 6976f0ea46f..b204fe4c990 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "woocommerce/action-scheduler": "3.1.5", "woocommerce/woocommerce-blocks": "2.5.16", "woocommerce/woocommerce-rest-api": "1.0.7", - "woocommerce/woocommerce-admin": "1.1.0" + "woocommerce/woocommerce-admin": "1.1.1" }, "require-dev": { "phpunit/phpunit": "7.5.20", diff --git a/composer.lock b/composer.lock index b20080276eb..8d09e371394 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "678668d06a12eae254dd92ed879b8a32", + "content-hash": "4f587bb7d4020e7b4987cd1dde300e48", "packages": [ { "name": "automattic/jetpack-autoloader", @@ -432,16 +432,16 @@ }, { "name": "woocommerce/woocommerce-admin", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/woocommerce/woocommerce-admin.git", - "reference": "3ef2eedca2b19c54f05333df9d9168a00499901b" + "reference": "79e78bb8b71fa0c0b0a77efee5474b46d62c1a76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/3ef2eedca2b19c54f05333df9d9168a00499901b", - "reference": "3ef2eedca2b19c54f05333df9d9168a00499901b", + "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/79e78bb8b71fa0c0b0a77efee5474b46d62c1a76", + "reference": "79e78bb8b71fa0c0b0a77efee5474b46d62c1a76", "shasum": "" }, "require": { @@ -475,7 +475,7 @@ ], "description": "A modern, javascript-driven WooCommerce Admin experience.", "homepage": "https://github.com/woocommerce/woocommerce-admin", - "time": "2020-04-21T00:28:43+00:00" + "time": "2020-04-28T22:16:15+00:00" }, { "name": "woocommerce/woocommerce-blocks", From 674dbbacac797ca0b5437f799f09cd23758b3627 Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Wed, 29 Apr 2020 15:58:59 -0600 Subject: [PATCH 5/5] Stop looking for commas and start looking for double quotes. --- bin/package-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package-update.sh b/bin/package-update.sh index 0a3cc1b6a95..da83d16e1fa 100755 --- a/bin/package-update.sh +++ b/bin/package-update.sh @@ -34,7 +34,7 @@ output 2 "Done!" output 3 "Updating package JS textdomains..." find ./packages/woocommerce-blocks -iname '*.js' -exec sed -i.bak -e "s/'woo-gutenberg-products-block'/'woocommerce'/g" -e "s/\"woo-gutenberg-products-block\"/'woocommerce'/g" {} \; -find ./packages/woocommerce-admin -iname '*.js' -exec sed -i.bak -e "s/, 'woocommerce-admin'/, 'woocommerce'/g" {} \; +find ./packages/woocommerce-admin -iname '*.js' -exec sed -i.bak -e "s/'woocommerce-admin'/'woocommerce'/g" -e "s/\"woocommerce-admin\"/'woocommerce'/g" {} \; # Cleanup backup files find ./packages -name "*.bak" -type f -delete