← All changes
|
modules/components/transformers/component-instance-transformer.php
+4
-13
4.3.0-beta3
→
3.35.7
View file →
| @@ -1,17 +1,13 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace Elementor\Modules\Components\Transformers; |
| 4 | 4 | |
| 5 | -use Elementor\Modules\AtomicWidgets\Elements\Base\Render_Context; | |
| 6 | 5 | use Elementor\Modules\AtomicWidgets\PropsResolver\Props_Resolver_Context; |
| 7 | 6 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformer_Base; |
| 8 | 7 | use Elementor\Plugin; |
| 9 | 8 | use Elementor\Core\Base\Document as Component_Document; |
| 10 | 9 | use Elementor\Modules\Components\Components_Repository; |
| 11 | -use Elementor\Modules\Components\Utils\Format_Component_Elements_Id; | |
| 12 | -use Elementor\Modules\Components\Utils\Reconcile_Component_Instance_Elements; | |
| 13 | -use Elementor\Modules\Components\Widgets\Component_Instance; | |
| 14 | 10 | |
| 15 | 11 | if ( ! defined( 'ABSPATH' ) ) { |
| 16 | 12 | exit; // Exit if accessed directly. |
| 17 | 13 | } |
| @@ -30,12 +26,10 @@ | ||
| 30 | 26 | if ( $this->is_circular_reference( $component_id ) ) { |
| 31 | 27 | return ''; |
| 32 | 28 | } |
| 33 | 29 | |
| 34 | - $instance_element_id = Render_Context::get( Component_Instance::class )['instance_id'] ?? ''; | |
| 35 | - | |
| 36 | 30 | self::$rendering_stack[] = $component_id; |
| 37 | - $content = $this->get_rendered_content( $component_id, $instance_element_id ); | |
| 31 | + $content = $this->get_rendered_content( $component_id ); | |
| 38 | 32 | array_pop( self::$rendering_stack ); |
| 39 | 33 | |
| 40 | 34 | return $content; |
| 41 | 35 | } |
| @@ -43,10 +37,10 @@ | ||
| 43 | 37 | private function is_circular_reference( int $component_id ): bool { |
| 44 | 38 | return in_array( $component_id, self::$rendering_stack, true ); |
| 45 | 39 | } |
| 46 | 40 | |
| 47 | - private function get_rendered_content( int $component_id, ?string $instance_element_id ): string { | |
| 48 | - $should_show_autosave = is_preview() || Plugin::$instance->editor->is_edit_mode(); | |
| 41 | + private function get_rendered_content( int $component_id ): string { | |
| 42 | + $should_show_autosave = is_preview(); | |
| 49 | 43 | $component = $this->get_repository()->get( $component_id, $should_show_autosave ); |
| 50 | 44 | |
| 51 | 45 | if ( ! $component || ! $this->should_render_content( $component ) ) { |
| 52 | 46 | return ''; |
| @@ -57,17 +51,14 @@ | ||
| 57 | 51 | $data = $component->get_elements_data(); |
| 58 | 52 | |
| 59 | 53 | $data = apply_filters( 'elementor/frontend/builder_content_data', $data, $component_id ); |
| 60 | 54 | |
| 61 | - $data = Reconcile_Component_Instance_Elements::apply( $data ); | |
| 62 | - $data = Format_Component_Elements_Id::format( $data, [ $instance_element_id ] ); | |
| 63 | - | |
| 64 | 55 | $content = ''; |
| 65 | 56 | |
| 66 | 57 | if ( ! empty( $data ) ) { |
| 67 | 58 | ob_start(); |
| 68 | 59 | |
| 69 | - $component->print_elements_without_cache( $data ); | |
| 60 | + $component->print_elements( $data ); | |
| 70 | 61 | |
| 71 | 62 | $content = ob_get_clean(); |
| 72 | 63 | |
| 73 | 64 | $content = apply_filters( 'elementor/frontend/the_content', $content ); |