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

@ -10,6 +10,8 @@
* @since 3.29
*/
defined( 'ABSPATH' ) || exit;
if ( ! class_exists( 'ET_Builder_Module_Tabs' ) ) {
require_once ET_BUILDER_DIR_RESOLVED_PATH . '/module/Tabs.php';
}
@ -28,9 +30,10 @@ class ET_Builder_Module_Woocommerce_Tabs extends ET_Builder_Module_Tabs {
parent::init();
// Define WooCommerce Tabs module property; overwriting inherited property.
$this->name = esc_html__( 'Woo Tabs', 'et_builder' );
$this->plural = esc_html__( 'Woo Tabs', 'et_builder' );
$this->slug = 'et_pb_wc_tabs';
$this->name = esc_html__( 'Woo Product Tabs', 'et_builder' );
$this->plural = esc_html__( 'Woo Product Tabs', 'et_builder' );
$this->slug = 'et_pb_wc_tabs';
$this->folder_name = 'et_pb_woo_modules';
/*
* Set property for holding rendering data so the data rendering via
@ -336,7 +339,9 @@ class ET_Builder_Module_Woocommerce_Tabs extends ET_Builder_Module_Tabs {
// Check if TB is used
$is_tb = et_builder_tb_enabled();
if ( $is_tb ) {
$is_use_placeholder = $is_tb || is_et_pb_preview();
if ( $is_use_placeholder ) {
et_theme_builder_wc_set_global_objects();
} elseif ( $overwrite_global ) {
// Save current global variable for later reset.
@ -363,7 +368,7 @@ class ET_Builder_Module_Woocommerce_Tabs extends ET_Builder_Module_Tabs {
}
if ( 'description' === $name ) {
if ( ! et_builder_tb_enabled() && ! et_pb_is_pagebuilder_used( $product_id ) ) {
if ( ! $is_use_placeholder && ! et_pb_is_pagebuilder_used( $product_id ) ) {
// If selected product doesn't use builder, retrieve post content.
if ( et_theme_builder_overrides_layout( ET_THEME_BUILDER_BODY_LAYOUT_POST_TYPE ) ) {
$tab_content = apply_filters( 'et_builder_wc_description', $post->post_content );
@ -376,7 +381,7 @@ class ET_Builder_Module_Woocommerce_Tabs extends ET_Builder_Module_Tabs {
* which might cause infinite loop; get Divi's long description from
* post meta instead.
*/
if ( et_builder_tb_enabled() ) {
if ( $is_use_placeholder ) {
$placeholders = et_theme_builder_wc_placeholders();
$tab_content = $placeholders['description'];
@ -413,7 +418,7 @@ class ET_Builder_Module_Woocommerce_Tabs extends ET_Builder_Module_Tabs {
}
// Reset overwritten global variable.
if ( $is_tb ) {
if ( $is_use_placeholder ) {
et_theme_builder_wc_reset_global_objects();
} elseif ( $overwrite_global ) {
$product = $original_product;