Merge branch 'trunk' into e2e/add-build-to-e2e-core-tests
This commit is contained in:
commit
c95db37f30
|
@ -21,7 +21,7 @@
|
|||
"pelago/emogrifier": "3.1.0",
|
||||
"psr/container": "1.0.0",
|
||||
"woocommerce/action-scheduler": "3.4.0",
|
||||
"woocommerce/woocommerce-admin": "3.0.0-rc.1",
|
||||
"woocommerce/woocommerce-admin": "3.0.1",
|
||||
"woocommerce/woocommerce-blocks": "6.5.1"
|
||||
},
|
||||
"require-dev": {
|
||||
|
|
|
@ -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": "ecce1670d22ae2df07e552adce1cfc29",
|
||||
"content-hash": "ebdb5708b79cdb94e4b2ff5fbed40d89",
|
||||
"packages": [
|
||||
{
|
||||
"name": "automattic/jetpack-autoloader",
|
||||
|
@ -543,16 +543,16 @@
|
|||
},
|
||||
{
|
||||
"name": "woocommerce/woocommerce-admin",
|
||||
"version": "3.0.0-rc.1",
|
||||
"version": "3.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/woocommerce/woocommerce-admin.git",
|
||||
"reference": "7c0cdd01ae98be058d684dd19023b0f40094cb63"
|
||||
"reference": "5542e80021a43d24ab9b1d2d67083b608899835d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/7c0cdd01ae98be058d684dd19023b0f40094cb63",
|
||||
"reference": "7c0cdd01ae98be058d684dd19023b0f40094cb63",
|
||||
"url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/5542e80021a43d24ab9b1d2d67083b608899835d",
|
||||
"reference": "5542e80021a43d24ab9b1d2d67083b608899835d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -608,9 +608,9 @@
|
|||
"homepage": "https://github.com/woocommerce/woocommerce-admin",
|
||||
"support": {
|
||||
"issues": "https://github.com/woocommerce/woocommerce-admin/issues",
|
||||
"source": "https://github.com/woocommerce/woocommerce-admin/tree/v3.0.0-rc.1"
|
||||
"source": "https://github.com/woocommerce/woocommerce-admin/tree/v3.0.1"
|
||||
},
|
||||
"time": "2021-12-14T23:55:42+00:00"
|
||||
"time": "2021-12-30T18:38:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "woocommerce/woocommerce-blocks",
|
||||
|
|
|
@ -484,12 +484,15 @@ function wc_is_file_valid_csv( $file, $check_path = true ) {
|
|||
}
|
||||
|
||||
/**
|
||||
* Check if the current theme is an FSE theme.
|
||||
* Check if the current theme is a block theme.
|
||||
*
|
||||
* @since x.x.x
|
||||
* @return bool
|
||||
*/
|
||||
function wc_current_theme_is_fse_theme() {
|
||||
if ( function_exists( 'wp_is_block_theme' ) ) {
|
||||
return (bool) wp_is_block_theme();
|
||||
}
|
||||
if ( function_exists( 'gutenberg_is_fse_theme' ) ) {
|
||||
return (bool) gutenberg_is_fse_theme();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue