Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Ron Rennick 2020-04-30 13:34:29 -03:00
parent b4fcfd93c2 8c24b46eb1
commit 105cea27c5
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/package-update.sh
View File

@ -34,7 +34,7 @@ output 2 "Done!"
output 3 "Updating package JS textdomains..." 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-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 # Cleanup backup files
find ./packages -name "*.bak" -type f -delete find ./packages -name "*.bak" -type f -delete

4
composer.json
View File

@ -13,8 +13,8 @@
"composer/installers": "1.7.0", "composer/installers": "1.7.0",
"maxmind-db/reader": "1.6.0", "maxmind-db/reader": "1.6.0",
"pelago/emogrifier": "^3.1", "pelago/emogrifier": "^3.1",
"woocommerce/action-scheduler": "3.1.4", "woocommerce/action-scheduler": "3.1.5",
"woocommerce/woocommerce-admin": "1.1.0", "woocommerce/woocommerce-admin": "1.1.1",
"woocommerce/woocommerce-blocks": "2.5.16", "woocommerce/woocommerce-blocks": "2.5.16",
"woocommerce/woocommerce-rest-api": "1.0.7" "woocommerce/woocommerce-rest-api": "1.0.7"
}, },

22
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "edacab36b41ea6ed95fa1807072b8993", "content-hash": "265265cc587459cc670e28108c87c9aa",
"packages": [ "packages": [
{ {
"name": "automattic/jetpack-autoloader", "name": "automattic/jetpack-autoloader",
@ -384,16 +384,16 @@
}, },
{ {
"name": "woocommerce/action-scheduler", "name": "woocommerce/action-scheduler",
"version": "3.1.4", "version": "3.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/woocommerce/action-scheduler.git", "url": "https://github.com/woocommerce/action-scheduler.git",
"reference": "5a01f0b549a283dc88c2feeef877650215907a76" "reference": "84e8ecba7d4f542f85fae7663e90eede1858b41b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/woocommerce/action-scheduler/zipball/5a01f0b549a283dc88c2feeef877650215907a76", "url": "https://api.github.com/repos/woocommerce/action-scheduler/zipball/84e8ecba7d4f542f85fae7663e90eede1858b41b",
"reference": "5a01f0b549a283dc88c2feeef877650215907a76", "reference": "84e8ecba7d4f542f85fae7663e90eede1858b41b",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@ -415,20 +415,20 @@
], ],
"description": "Action Scheduler for WordPress and WooCommerce", "description": "Action Scheduler for WordPress and WooCommerce",
"homepage": "https://actionscheduler.org/", "homepage": "https://actionscheduler.org/",
"time": "2020-03-18T15:05:10+00:00" "time": "2020-04-29T16:19:22+00:00"
}, },
{ {
"name": "woocommerce/woocommerce-admin", "name": "woocommerce/woocommerce-admin",
"version": "v1.1.0", "version": "v1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/woocommerce/woocommerce-admin.git", "url": "https://github.com/woocommerce/woocommerce-admin.git",
"reference": "3ef2eedca2b19c54f05333df9d9168a00499901b" "reference": "79e78bb8b71fa0c0b0a77efee5474b46d62c1a76"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/3ef2eedca2b19c54f05333df9d9168a00499901b", "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/79e78bb8b71fa0c0b0a77efee5474b46d62c1a76",
"reference": "3ef2eedca2b19c54f05333df9d9168a00499901b", "reference": "79e78bb8b71fa0c0b0a77efee5474b46d62c1a76",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -462,7 +462,7 @@
], ],
"description": "A modern, javascript-driven WooCommerce Admin experience.", "description": "A modern, javascript-driven WooCommerce Admin experience.",
"homepage": "https://github.com/woocommerce/woocommerce-admin", "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", "name": "woocommerce/woocommerce-blocks",

2
includes/admin/helper/class-wc-helper.php
View File

@ -1149,6 +1149,8 @@ class WC_Helper {
require_once ABSPATH . 'wp-admin/includes/plugin.php'; require_once ABSPATH . 'wp-admin/includes/plugin.php';
} }
// Reset plugin cache before retrieving plugin list.
wp_clean_plugins_cache();
$plugins = get_plugins(); $plugins = get_plugins();
$woo_plugins = array(); $woo_plugins = array();

11
includes/class-wc-template-loader.php
View File

@ -127,7 +127,16 @@ class WC_Template_Loader {
$templates[] = 'woocommerce.php'; $templates[] = 'woocommerce.php';
if ( is_page_template() ) { 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' ) ) { if ( is_singular( 'product' ) ) {