Upgarded to 4.17.4

This commit is contained in:
2022-06-23 13:17:18 +01:00
parent 80f1e87db9
commit a04fb0c7af
404 changed files with 54683 additions and 4417 deletions

View File

@ -66,9 +66,11 @@ function et_theme_builder_wc_review_placeholder() {
* @param array $conditional_tags evaluate conditional tags when current request is AJAX request
*/
function et_theme_builder_wc_set_global_objects( $conditional_tags = array() ) {
$is_tb = et_()->array_get( $conditional_tags, 'is_tb', false );
$is_tb = et_()->array_get( $conditional_tags, 'is_tb', false );
$is_use_placeholder = $is_tb || is_et_pb_preview();
// Check if current request is theme builder (direct page / AJAX request)
if ( ! et_builder_tb_enabled() && ! $is_tb ) {
if ( ! et_builder_tb_enabled() && ! $is_use_placeholder ) {
return;
}
@ -101,7 +103,7 @@ function et_theme_builder_wc_set_global_objects( $conditional_tags = array() ) {
// Get placeholders
$placeholders = et_theme_builder_wc_placeholders();
if ( $is_tb ) {
if ( $is_use_placeholder ) {
$placeholder_src = wc_placeholder_img_src( 'full' );
$placeholder_id = attachment_url_to_postid( $placeholder_src );
@ -131,7 +133,9 @@ function et_theme_builder_wc_set_global_objects( $conditional_tags = array() ) {
// Set current post ID as product's ID. `ET_Theme_Builder_Woocommerce_Product_Variable_Placeholder`
// handles all placeholder related value but product ID need to be manually set to match current
// post's ID. This is especially needed when add-ons is used and accessing get_id() method.
$product->set_id( $post->ID );
if ( isset( $post->ID ) ) {
$product->set_id( $post->ID );
}
// Save modified global for later use
$tb_wc_post = $post;
@ -142,9 +146,16 @@ function et_theme_builder_wc_set_global_objects( $conditional_tags = array() ) {
* Reset global objects needed to manipulate `ETBuilderBackend.currentPage.woocommerceComponents`
*
* @since 4.0.1
* @since 4.14.5 Add conditional tags parameter to evaluate AJAX request.
*
* @param array $conditional_tags Evaluate conditional tags when current request is AJAX request.
*/
function et_theme_builder_wc_reset_global_objects() {
if ( ! et_builder_tb_enabled() ) {
function et_theme_builder_wc_reset_global_objects( $conditional_tags = array() ) {
$is_tb = et_()->array_get( $conditional_tags, 'is_tb', false );
$is_use_placeholder = $is_tb || is_et_pb_preview();
// Check if current request is theme builder (direct page / AJAX request).
if ( ! et_builder_tb_enabled() && ! $is_use_placeholder ) {
return;
}