| @@ -5,9 +5,8 @@ | ||
| 5 | 5 | use Elementor\Core\Base\Elements_Iteration_Actions\Base as Elements_Iteration_Action; |
| 6 | 6 | use Elementor\Core\Behaviors\Interfaces\Lock_Behavior; |
| 7 | 7 | use Elementor\Core\Files\CSS\Post as Post_CSS; |
| 8 | 8 | use Elementor\Core\Settings\Page\Model as Page_Model; |
| 9 | -use Elementor\Core\Utils\Collection; | |
| 10 | 9 | use Elementor\Core\Utils\Exceptions; |
| 11 | 10 | use Elementor\Includes\Elements\Container; |
| 12 | 11 | use Elementor\Plugin; |
| 13 | 12 | use Elementor\Controls_Manager; |
| @@ -18,12 +17,11 @@ | ||
| 18 | 17 | use Elementor\Utils; |
| 19 | 18 | use Elementor\Widget_Base; |
| 20 | 19 | use Elementor\Core\Settings\Page\Manager as PageManager; |
| 21 | 20 | use ElementorPro\Modules\Library\Widgets\Template; |
| 22 | -use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager; | |
| 23 | 21 | |
| 24 | 22 | if ( ! defined( 'ABSPATH' ) ) { |
| 25 | - exit; // Exit if accessed directly. | |
| 23 | + exit; // Exit if accessed directly | |
| 26 | 24 | } |
| 27 | 25 | |
| 28 | 26 | /** |
| 29 | 27 | * Elementor document. |
| @@ -40,16 +38,11 @@ | ||
| 40 | 38 | * Document type meta key. |
| 41 | 39 | */ |
| 42 | 40 | const TYPE_META_KEY = '_elementor_template_type'; |
| 43 | 41 | const PAGE_META_KEY = '_elementor_page_settings'; |
| 44 | - const ELEMENTOR_DATA_META_KEY = '_elementor_data'; | |
| 45 | 42 | |
| 46 | 43 | const BUILT_WITH_ELEMENTOR_META_KEY = '_elementor_edit_mode'; |
| 47 | 44 | |
| 48 | - const CACHE_META_KEY = '_elementor_element_cache'; | |
| 49 | - | |
| 50 | - const UNEDITABLE_WITH_ELEMENTOR_TYPES = [ 'kit' ]; | |
| 51 | - | |
| 52 | 45 | /** |
| 53 | 46 | * Document publish status. |
| 54 | 47 | */ |
| 55 | 48 | const STATUS_PUBLISH = 'publish'; |
| @@ -73,11 +66,9 @@ | ||
| 73 | 66 | * Document pending status. |
| 74 | 67 | */ |
| 75 | 68 | const STATUS_PENDING = 'pending'; |
| 76 | 69 | |
| 77 | - /** | |
| 78 | - * @var int | |
| 79 | - */ | |
| 70 | + | |
| 80 | 71 | private $main_id; |
| 81 | 72 | |
| 82 | 73 | /** |
| 83 | 74 | * @var bool |
| @@ -103,44 +94,8 @@ | ||
| 103 | 94 | */ |
| 104 | 95 | protected $post; |
| 105 | 96 | |
| 106 | 97 | /** |
| 107 | - * @param array $internal_elements | |
| 108 | - * | |
| 109 | - * @return array[] | |
| 110 | - */ | |
| 111 | - private function get_container_elements_data( array $internal_elements ): array { | |
| 112 | - return [ | |
| 113 | - [ | |
| 114 | - 'id' => Utils::generate_random_string(), | |
| 115 | - 'elType' => 'container', | |
| 116 | - 'elements' => $internal_elements, | |
| 117 | - ], | |
| 118 | - ]; | |
| 119 | - } | |
| 120 | - | |
| 121 | - /** | |
| 122 | - * @param array $internal_elements | |
| 123 | - * | |
| 124 | - * @return array[] | |
| 125 | - */ | |
| 126 | - private function get_sections_elements_data( array $internal_elements ): array { | |
| 127 | - return [ | |
| 128 | - [ | |
| 129 | - 'id' => Utils::generate_random_string(), | |
| 130 | - 'elType' => 'section', | |
| 131 | - 'elements' => [ | |
| 132 | - [ | |
| 133 | - 'id' => Utils::generate_random_string(), | |
| 134 | - 'elType' => 'column', | |
| 135 | - 'elements' => $internal_elements, | |
| 136 | - ], | |
| 137 | - ], | |
| 138 | - ], | |
| 139 | - ]; | |
| 140 | - } | |
| 141 | - | |
| 142 | - /** | |
| 143 | 98 | * @since 2.1.0 |
| 144 | 99 | * @access protected |
| 145 | 100 | * @static |
| 146 | 101 | */ |
| @@ -166,15 +121,8 @@ | ||
| 166 | 121 | 'edit_capability' => '', |
| 167 | 122 | 'show_in_finder' => true, |
| 168 | 123 | 'show_on_admin_bar' => true, |
| 169 | 124 | 'support_kit' => false, |
| 170 | - 'show_navigator' => true, | |
| 171 | - 'allow_adding_widgets' => true, | |
| 172 | - 'support_page_layout' => true, | |
| 173 | - 'show_copy_and_share' => false, | |
| 174 | - 'library_close_title' => esc_html__( 'Close', 'elementor' ), | |
| 175 | - 'publish_button_title' => esc_html__( 'Publish', 'elementor' ), | |
| 176 | - 'allow_closing_remote_library' => true, | |
| 177 | 125 | ]; |
| 178 | 126 | } |
| 179 | 127 | |
| 180 | 128 | /** |
| @@ -191,70 +139,20 @@ | ||
| 191 | 139 | |
| 192 | 140 | return [ |
| 193 | 141 | 'title' => static::get_title(), // JS Container title. |
| 194 | 142 | 'widgets_settings' => [], |
| 195 | - 'elements_categories' => self::get_filtered_editor_panel_categories(), | |
| 143 | + 'elements_categories' => static::get_editor_panel_categories(), | |
| 196 | 144 | 'default_route' => $default_route, |
| 197 | 145 | 'has_elements' => static::get_property( 'has_elements' ), |
| 198 | 146 | 'support_kit' => static::get_property( 'support_kit' ), |
| 199 | 147 | 'messages' => [ |
| 200 | - 'publish_notification' => sprintf( | |
| 201 | - /* translators: %s: Document title. */ | |
| 202 | - esc_html__( 'Hurray! Your %s is live.', 'elementor' ), | |
| 203 | - static::get_title() | |
| 204 | - ), | |
| 148 | + /* translators: %s: Document title. */ | |
| 149 | + 'publish_notification' => sprintf( esc_html__( 'Hurray! Your %s is live.', 'elementor' ), static::get_title() ), | |
| 205 | 150 | ], |
| 206 | - 'show_navigator' => static::get_property( 'show_navigator' ), | |
| 207 | - 'allow_adding_widgets' => static::get_property( 'allow_adding_widgets' ), | |
| 208 | - 'show_copy_and_share' => static::get_property( 'show_copy_and_share' ), | |
| 209 | - 'library_close_title' => static::get_property( 'library_close_title' ), | |
| 210 | - 'publish_button_title' => static::get_property( 'publish_button_title' ), | |
| 211 | - 'allow_closing_remote_library' => static::get_property( 'allow_closing_remote_library' ), | |
| 212 | 151 | ]; |
| 213 | 152 | } |
| 214 | 153 | |
| 215 | - public static function get_filtered_editor_panel_categories(): array { | |
| 216 | - $categories = static::get_editor_panel_categories(); | |
| 217 | - $has_pro = Utils::has_pro(); | |
| 218 | - | |
| 219 | - foreach ( $categories as $index => $category ) { | |
| 220 | - if ( isset( $category['promotion'] ) ) { | |
| 221 | - $categories = self::get_panel_category_item( $category['promotion'], $index, $categories, $has_pro ); | |
| 222 | - } | |
| 223 | - } | |
| 224 | - | |
| 225 | - return $categories; | |
| 226 | - } | |
| 227 | - | |
| 228 | 154 | /** |
| 229 | - * @param $promotion | |
| 230 | - * @param $index | |
| 231 | - * @param array $categories | |
| 232 | - * | |
| 233 | - * @return array | |
| 234 | - */ | |
| 235 | - private static function get_panel_category_item( $promotion, $index, array $categories, bool $has_pro ): array { | |
| 236 | - $keep_promotion = $has_pro && apply_filters( | |
| 237 | - 'elementor/document/panel_category_keep_promotion', | |
| 238 | - false, | |
| 239 | - $index, | |
| 240 | - $promotion | |
| 241 | - ); | |
| 242 | - | |
| 243 | - if ( ! $has_pro || $keep_promotion ) { | |
| 244 | - $categories[ $index ]['promotion'] = Filtered_Promotions_Manager::get_filtered_promotion_data( | |
| 245 | - $promotion, | |
| 246 | - 'elementor/panel/' . $index . '/custom_promotion', | |
| 247 | - 'url' | |
| 248 | - ); | |
| 249 | - } else { | |
| 250 | - unset( $categories[ $index ]['promotion'] ); | |
| 251 | - } | |
| 252 | - | |
| 253 | - return $categories; | |
| 254 | - } | |
| 255 | - | |
| 256 | - /** | |
| 257 | 155 | * Get element title. |
| 258 | 156 | * |
| 259 | 157 | * Retrieve the element title. |
| 260 | 158 | * |
| @@ -272,13 +170,9 @@ | ||
| 272 | 170 | return static::get_title(); |
| 273 | 171 | } |
| 274 | 172 | |
| 275 | 173 | public static function get_add_new_title() { |
| 276 | - return sprintf( | |
| 277 | - /* translators: %s: Document title. */ | |
| 278 | - esc_html__( 'Add New %s', 'elementor' ), | |
| 279 | - static::get_title() | |
| 280 | - ); | |
| 174 | + return sprintf( esc_html__( 'Add New %s', 'elementor' ), static::get_title() ); | |
| 281 | 175 | } |
| 282 | 176 | |
| 283 | 177 | /** |
| 284 | 178 | * Get property. |
| @@ -446,12 +340,12 @@ | ||
| 446 | 340 | $main_post_id = $this->get_main_id(); |
| 447 | 341 | $document = $this; |
| 448 | 342 | |
| 449 | 343 | // Ajax request from editor. |
| 450 | - $initial_document_id = Utils::get_super_global_value( $_POST, 'initial_document_id' ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 451 | - | |
| 452 | - if ( ! empty( $initial_document_id ) ) { | |
| 453 | - $document = Plugin::$instance->documents->get( $initial_document_id ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 344 | + // PHPCS - only reading the value from $_POST['initial_document_id']. | |
| 345 | + if ( ! empty( $_POST['initial_document_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 346 | + // PHPCS - only reading the value from $_POST['initial_document_id']. | |
| 347 | + $document = Plugin::$instance->documents->get( $_POST['initial_document_id'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 454 | 348 | } |
| 455 | 349 | |
| 456 | 350 | $url = get_preview_post_link( |
| 457 | 351 | $document->get_main_id(), |
| @@ -559,10 +453,12 @@ | ||
| 559 | 453 | * |
| 560 | 454 | * @since 2.0.0 |
| 561 | 455 | * @access public |
| 562 | 456 | * |
| 457 | + * | |
| 563 | 458 | * @return bool|Document |
| 564 | 459 | */ |
| 460 | + | |
| 565 | 461 | public function get_newer_autosave() { |
| 566 | 462 | $autosave = $this->get_autosave(); |
| 567 | 463 | |
| 568 | 464 | // Detect if there exists an autosave newer than the post. |
| @@ -617,12 +513,8 @@ | ||
| 617 | 513 | |
| 618 | 514 | if ( $autosave_id ) { |
| 619 | 515 | $document = Plugin::$instance->documents->get( $autosave_id ); |
| 620 | 516 | } elseif ( $create ) { |
| 621 | - if ( ! function_exists( 'wp_create_post_autosave' ) ) { | |
| 622 | - require_once ABSPATH . 'wp-admin/includes/post.php'; | |
| 623 | - } | |
| 624 | - | |
| 625 | 517 | $autosave_id = wp_create_post_autosave( [ |
| 626 | 518 | 'post_ID' => $this->post->ID, |
| 627 | 519 | 'post_type' => $this->post->post_type, |
| 628 | 520 | 'post_title' => $this->post->post_title, |
| @@ -651,14 +543,14 @@ | ||
| 651 | 543 | * Fired by `post_row_actions` and `page_row_actions` filters. |
| 652 | 544 | * |
| 653 | 545 | * @access public |
| 654 | 546 | * |
| 655 | - * @param array $actions An array of row action links. | |
| 547 | + * @param array $actions An array of row action links. | |
| 656 | 548 | * |
| 657 | 549 | * @return array An updated array of row action links. |
| 658 | 550 | */ |
| 659 | 551 | public function filter_admin_row_actions( $actions ) { |
| 660 | - if ( $this->is_editable_with_elementor() ) { | |
| 552 | + if ( $this->is_built_with_elementor() && $this->is_editable_by_current_user() ) { | |
| 661 | 553 | $actions['edit_with_elementor'] = sprintf( |
| 662 | 554 | '<a href="%1$s">%2$s</a>', |
| 663 | 555 | $this->get_edit_url(), |
| 664 | 556 | __( 'Edit with Elementor', 'elementor' ) |
| @@ -667,16 +559,8 @@ | ||
| 667 | 559 | |
| 668 | 560 | return $actions; |
| 669 | 561 | } |
| 670 | 562 | |
| 671 | - public function is_editable_with_elementor() { | |
| 672 | - if ( in_array( $this->get_type(), self::UNEDITABLE_WITH_ELEMENTOR_TYPES ) ) { | |
| 673 | - return false; | |
| 674 | - } | |
| 675 | - | |
| 676 | - return $this->is_editable_by_current_user() && $this->is_built_with_elementor(); | |
| 677 | - } | |
| 678 | - | |
| 679 | 563 | /** |
| 680 | 564 | * @since 2.0.0 |
| 681 | 565 | * @access public |
| 682 | 566 | */ |
| @@ -701,12 +585,10 @@ | ||
| 701 | 585 | if ( $locked_user ) { |
| 702 | 586 | $locked_user = $locked_user->display_name; |
| 703 | 587 | } |
| 704 | 588 | |
| 705 | - $post = $this->get_main_post(); | |
| 589 | + $post_type_object = get_post_type_object( $this->get_main_post()->post_type ); | |
| 706 | 590 | |
| 707 | - $post_type_object = get_post_type_object( $post->post_type ); | |
| 708 | - | |
| 709 | 591 | $settings = SettingsManager::get_settings_managers_config(); |
| 710 | 592 | |
| 711 | 593 | $config = [ |
| 712 | 594 | 'id' => $this->get_main_id(), |
| @@ -734,28 +616,22 @@ | ||
| 734 | 616 | 'main_dashboard' => $this->get_main_dashboard_url(), |
| 735 | 617 | ], |
| 736 | 618 | ]; |
| 737 | 619 | |
| 738 | - $post_status_object = get_post_status_object( $post->post_status ); | |
| 739 | - | |
| 740 | - if ( $post_status_object ) { | |
| 741 | - $config['status'] = [ | |
| 742 | - 'value' => $post_status_object->name, | |
| 743 | - 'label' => $post_status_object->label, | |
| 744 | - ]; | |
| 745 | - } | |
| 746 | - | |
| 747 | 620 | do_action( 'elementor/document/before_get_config', $this ); |
| 748 | 621 | |
| 749 | 622 | if ( static::get_property( 'has_elements' ) ) { |
| 750 | - $elements_config = Collection::make( Plugin::$instance->elements_manager->get_element_types() ) | |
| 751 | - ->filter( fn( $element ) => ( ! empty( $element->get_config()['include_in_widgets_config'] ) ) ) | |
| 752 | - ->map( fn( $element ) => $element->get_config() ) | |
| 753 | - ->all(); | |
| 623 | + $container_config = []; | |
| 624 | + $experiments_manager = Plugin::$instance->experiments; | |
| 754 | 625 | |
| 626 | + if ( $experiments_manager->is_feature_active( 'container' ) ) { | |
| 627 | + $container_config = [ | |
| 628 | + 'container' => Plugin::$instance->elements_manager->get_element_types( 'container' )->get_config(), | |
| 629 | + ]; | |
| 630 | + } | |
| 631 | + | |
| 755 | 632 | $config['elements'] = $this->get_elements_raw_data( null, true ); |
| 756 | - // `get_elements_raw_data` has to be called before `get_widget_types_config`, because it affects it. | |
| 757 | - $config['widgets'] = array_merge( $elements_config, Plugin::$instance->widgets_manager->get_widget_types_config() ); | |
| 633 | + $config['widgets'] = $container_config + Plugin::$instance->widgets_manager->get_widget_types_config(); | |
| 758 | 634 | } |
| 759 | 635 | |
| 760 | 636 | $additional_config = []; |
| 761 | 637 | |
| @@ -810,16 +686,8 @@ | ||
| 810 | 686 | * @return bool |
| 811 | 687 | */ |
| 812 | 688 | public function save( $data ) { |
| 813 | 689 | /** |
| 814 | - * Set locale to "C" to avoid issues with comma as decimal separator. | |
| 815 | - * | |
| 816 | - * @see https://github.com/elementor/elementor/issues/10992 | |
| 817 | - */ | |
| 818 | - $original_lc = setlocale( LC_NUMERIC, 0 ); | |
| 819 | - setlocale( LC_NUMERIC, 'C' ); | |
| 820 | - | |
| 821 | - /** | |
| 822 | 690 | * Document save data. |
| 823 | 691 | * |
| 824 | 692 | * Filter the document data before saving process starts. |
| 825 | 693 | * |
| @@ -853,9 +721,9 @@ | ||
| 853 | 721 | */ |
| 854 | 722 | do_action( 'elementor/document/before_save', $this, $data ); |
| 855 | 723 | |
| 856 | 724 | if ( ! current_user_can( 'unfiltered_html' ) ) { |
| 857 | - $data = Utils::kses_post_deep( $data ); | |
| 725 | + $data = wp_kses_post_deep( $data ); | |
| 858 | 726 | } |
| 859 | 727 | |
| 860 | 728 | if ( ! empty( $data['settings'] ) ) { |
| 861 | 729 | if ( isset( $data['settings']['post_status'] ) && self::STATUS_AUTOSAVE === $data['settings']['post_status'] ) { |
| @@ -882,11 +750,8 @@ | ||
| 882 | 750 | $post_css = Post_CSS::create( $this->post->ID ); |
| 883 | 751 | |
| 884 | 752 | $post_css->delete(); |
| 885 | 753 | |
| 886 | - // Remove Document Cache | |
| 887 | - $this->delete_cache(); | |
| 888 | - | |
| 889 | 754 | /** |
| 890 | 755 | * After document save. |
| 891 | 756 | * |
| 892 | 757 | * Fires when document save is complete. |
| @@ -901,10 +766,8 @@ | ||
| 901 | 766 | $this->set_is_saving( false ); |
| 902 | 767 | |
| 903 | 768 | $this->remove_handle_revisions_changed_filter(); |
| 904 | 769 | |
| 905 | - setlocale( LC_NUMERIC, $original_lc ); | |
| 906 | - | |
| 907 | 770 | return true; |
| 908 | 771 | } |
| 909 | 772 | |
| 910 | 773 | public function refresh_post() { |
| @@ -940,9 +803,9 @@ | ||
| 940 | 803 | * |
| 941 | 804 | * @return bool Whether the post was built with Elementor. |
| 942 | 805 | */ |
| 943 | 806 | public function is_built_with_elementor() { |
| 944 | - return (bool) $this->get_meta( self::BUILT_WITH_ELEMENTOR_META_KEY ); | |
| 807 | + return ! ! $this->get_meta( self::BUILT_WITH_ELEMENTOR_META_KEY ); | |
| 945 | 808 | } |
| 946 | 809 | |
| 947 | 810 | /** |
| 948 | 811 | * Mark the post as "built with elementor" or not. |
| @@ -1051,16 +914,8 @@ | ||
| 1051 | 914 | |
| 1052 | 915 | return $meta; |
| 1053 | 916 | } |
| 1054 | 917 | |
| 1055 | - public function update_json_meta( $key, $value ) { | |
| 1056 | - return $this->update_meta( | |
| 1057 | - $key, | |
| 1058 | - // `wp_slash` in order to avoid the unslashing during the `update_post_meta` | |
| 1059 | - wp_slash( wp_json_encode( $value ) ) | |
| 1060 | - ); | |
| 1061 | - } | |
| 1062 | - | |
| 1063 | 918 | /** |
| 1064 | 919 | * @since 2.0.0 |
| 1065 | 920 | * @access public |
| 1066 | 921 | * |
| @@ -1067,10 +922,8 @@ | ||
| 1067 | 922 | * @param null $data |
| 1068 | 923 | * @param bool $with_html_content |
| 1069 | 924 | * |
| 1070 | 925 | * @return array |
| 1071 | - * | |
| 1072 | - * @throws \Exception If elements retrieval fails or data processing errors occur. | |
| 1073 | 926 | */ |
| 1074 | 927 | public function get_elements_raw_data( $data = null, $with_html_content = false ) { |
| 1075 | 928 | if ( ! static::get_property( 'has_elements' ) ) { |
| 1076 | 929 | return []; |
| @@ -1079,23 +932,8 @@ | ||
| 1079 | 932 | if ( is_null( $data ) ) { |
| 1080 | 933 | $data = $this->get_elements_data(); |
| 1081 | 934 | } |
| 1082 | 935 | |
| 1083 | - /** | |
| 1084 | - * Filters document elements data after loading. | |
| 1085 | - * | |
| 1086 | - * Allows modification of elements data when loading (not saving). | |
| 1087 | - * Useful for migrations, transformations, or data enrichment. | |
| 1088 | - * | |
| 1089 | - * @since 3.35.0 | |
| 1090 | - * | |
| 1091 | - * @param array $data The elements data array. | |
| 1092 | - * @param \Elementor\Core\Base\Document $document The document instance. | |
| 1093 | - */ | |
| 1094 | - if ( ! $this->is_saving ) { | |
| 1095 | - $data = apply_filters( 'elementor/document/load/data', $data, $this ); | |
| 1096 | - } | |
| 1097 | - | |
| 1098 | 936 | // Change the current documents, so widgets can use `documents->get_current` and other post data |
| 1099 | 937 | Plugin::$instance->documents->switch_to_document( $this ); |
| 1100 | 938 | |
| 1101 | 939 | $editor_data = []; |
| @@ -1120,9 +958,9 @@ | ||
| 1120 | 958 | $element_data = $element->get_raw_data( $with_html_content ); |
| 1121 | 959 | } |
| 1122 | 960 | |
| 1123 | 961 | $editor_data[] = $element_data; |
| 1124 | - } | |
| 962 | + } // End foreach(). | |
| 1125 | 963 | |
| 1126 | 964 | Plugin::$instance->documents->restore_document(); |
| 1127 | 965 | |
| 1128 | 966 | return $editor_data; |
| @@ -1136,9 +974,9 @@ | ||
| 1136 | 974 | * |
| 1137 | 975 | * @return array |
| 1138 | 976 | */ |
| 1139 | 977 | public function get_elements_data( $status = self::STATUS_PUBLISH ) { |
| 1140 | - $elements = $this->get_json_meta( self::ELEMENTOR_DATA_META_KEY ); | |
| 978 | + $elements = $this->get_json_meta( '_elementor_data' ); | |
| 1141 | 979 | |
| 1142 | 980 | if ( self::STATUS_DRAFT === $status ) { |
| 1143 | 981 | $autosave = $this->get_newer_autosave(); |
| 1144 | 982 | |
| @@ -1144,9 +982,9 @@ | ||
| 1144 | 982 | |
| 1145 | 983 | if ( is_object( $autosave ) ) { |
| 1146 | 984 | $autosave_elements = Plugin::$instance->documents |
| 1147 | 985 | ->get( $autosave->get_post()->ID ) |
| 1148 | - ->get_json_meta( self::ELEMENTOR_DATA_META_KEY ); | |
| 986 | + ->get_json_meta( '_elementor_data' ); | |
| 1149 | 987 | } |
| 1150 | 988 | } |
| 1151 | 989 | |
| 1152 | 990 | if ( Plugin::$instance->editor->is_edit_mode() ) { |
| @@ -1207,20 +1045,28 @@ | ||
| 1207 | 1045 | ]; |
| 1208 | 1046 | } |
| 1209 | 1047 | |
| 1210 | 1048 | // TODO: Better coding to start template for editor |
| 1211 | - $converted_blocks = [ | |
| 1049 | + return [ | |
| 1212 | 1050 | [ |
| 1213 | 1051 | 'id' => Utils::generate_random_string(), |
| 1214 | - 'elType' => $widget_type::get_type(), | |
| 1215 | - 'widgetType' => $widget_type->get_name(), | |
| 1216 | - 'settings' => $settings, | |
| 1052 | + 'elType' => 'section', | |
| 1053 | + 'elements' => [ | |
| 1054 | + [ | |
| 1055 | + 'id' => Utils::generate_random_string(), | |
| 1056 | + 'elType' => 'column', | |
| 1057 | + 'elements' => [ | |
| 1058 | + [ | |
| 1059 | + 'id' => Utils::generate_random_string(), | |
| 1060 | + 'elType' => $widget_type::get_type(), | |
| 1061 | + 'widgetType' => $widget_type->get_name(), | |
| 1062 | + 'settings' => $settings, | |
| 1063 | + ], | |
| 1064 | + ], | |
| 1065 | + ], | |
| 1066 | + ], | |
| 1217 | 1067 | ], |
| 1218 | 1068 | ]; |
| 1219 | - | |
| 1220 | - return Plugin::$instance->experiments->is_feature_active( 'container' ) | |
| 1221 | - ? $this->get_container_elements_data( $converted_blocks ) | |
| 1222 | - : $this->get_sections_elements_data( $converted_blocks ); | |
| 1223 | 1069 | } |
| 1224 | 1070 | |
| 1225 | 1071 | /** |
| 1226 | 1072 | * @since 2.1.3 |
| @@ -1230,11 +1076,20 @@ | ||
| 1230 | 1076 | if ( ! $elements_data ) { |
| 1231 | 1077 | $elements_data = $this->get_elements_data(); |
| 1232 | 1078 | } |
| 1233 | 1079 | |
| 1080 | + $is_dom_optimization_active = Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ); | |
| 1234 | 1081 | ?> |
| 1235 | 1082 | <div <?php Utils::print_html_attributes( $this->get_container_attributes() ); ?>> |
| 1083 | + <?php if ( ! $is_dom_optimization_active ) : ?> | |
| 1084 | + <div class="elementor-inner"> | |
| 1085 | + <div class="elementor-section-wrap"> | |
| 1086 | + <?php endif; ?> | |
| 1236 | 1087 | <?php $this->print_elements( $elements_data ); ?> |
| 1088 | + <?php if ( ! $is_dom_optimization_active ) : ?> | |
| 1089 | + </div> | |
| 1090 | + </div> | |
| 1091 | + <?php endif; ?> | |
| 1237 | 1092 | </div> |
| 1238 | 1093 | <?php |
| 1239 | 1094 | } |
| 1240 | 1095 | |
| @@ -1251,13 +1106,10 @@ | ||
| 1251 | 1106 | * @access public |
| 1252 | 1107 | */ |
| 1253 | 1108 | public function get_panel_page_settings() { |
| 1254 | 1109 | return [ |
| 1255 | - 'title' => sprintf( | |
| 1256 | - /* translators: %s: Document title. */ | |
| 1257 | - esc_html__( '%s Settings', 'elementor' ), | |
| 1258 | - static::get_title() | |
| 1259 | - ), | |
| 1110 | + /* translators: %s: Document title. */ | |
| 1111 | + 'title' => sprintf( esc_html__( '%s Settings', 'elementor' ), static::get_title() ), | |
| 1260 | 1112 | ]; |
| 1261 | 1113 | } |
| 1262 | 1114 | |
| 1263 | 1115 | /** |
| @@ -1314,9 +1166,9 @@ | ||
| 1314 | 1166 | * @param array|null $controls The available controls. |
| 1315 | 1167 | * |
| 1316 | 1168 | * @return array Element data. |
| 1317 | 1169 | */ |
| 1318 | - public static function on_import_update_dynamic_content( array $config, array $data, $controls = null ): array { | |
| 1170 | + public static function on_import_update_dynamic_content( array $config, array $data, $controls = null ) : array { | |
| 1319 | 1171 | foreach ( $config as &$element_config ) { |
| 1320 | 1172 | $element_instance = Plugin::$instance->elements_manager->create_element_instance( $element_config ); |
| 1321 | 1173 | |
| 1322 | 1174 | if ( is_null( $element_instance ) ) { |
| @@ -1336,39 +1188,8 @@ | ||
| 1336 | 1188 | return $config; |
| 1337 | 1189 | } |
| 1338 | 1190 | |
| 1339 | 1191 | /** |
| 1340 | - * Update dynamic settings in the document for import. | |
| 1341 | - * | |
| 1342 | - * @param array $settings The settings of the document. | |
| 1343 | - * @param array $config Import config to update the settings. | |
| 1344 | - * | |
| 1345 | - * @return array | |
| 1346 | - */ | |
| 1347 | - public function on_import_update_settings( array $settings, array $config ): array { | |
| 1348 | - $controls = $this->get_controls(); | |
| 1349 | - $controls_manager = Plugin::$instance->controls_manager; | |
| 1350 | - | |
| 1351 | - foreach ( $settings as $key => $value ) { | |
| 1352 | - | |
| 1353 | - if ( ! isset( $controls[ $key ] ) ) { | |
| 1354 | - continue; | |
| 1355 | - } | |
| 1356 | - | |
| 1357 | - $control = $controls[ $key ]; | |
| 1358 | - $control_instance = $controls_manager->get_control( $control['type'] ); | |
| 1359 | - | |
| 1360 | - if ( ! $control_instance ) { | |
| 1361 | - continue; | |
| 1362 | - } | |
| 1363 | - | |
| 1364 | - $settings[ $key ] = $control_instance->on_import_update_settings( $value, $control, $config ); | |
| 1365 | - } | |
| 1366 | - | |
| 1367 | - return $settings; | |
| 1368 | - } | |
| 1369 | - | |
| 1370 | - /** | |
| 1371 | 1192 | * Save editor elements. |
| 1372 | 1193 | * |
| 1373 | 1194 | * Save data from the editor to the database. |
| 1374 | 1195 | * |
| @@ -1383,9 +1204,9 @@ | ||
| 1383 | 1204 | // We need the `wp_slash` in order to avoid the unslashing during the `update_post_meta` |
| 1384 | 1205 | $json_value = wp_slash( wp_json_encode( $editor_data ) ); |
| 1385 | 1206 | |
| 1386 | 1207 | // Don't use `update_post_meta` that can't handle `revision` post type |
| 1387 | - $is_meta_updated = update_metadata( 'post', $this->post->ID, self::ELEMENTOR_DATA_META_KEY, $json_value ); | |
| 1208 | + $is_meta_updated = update_metadata( 'post', $this->post->ID, '_elementor_data', $json_value ); | |
| 1388 | 1209 | |
| 1389 | 1210 | /** |
| 1390 | 1211 | * Before saving data. |
| 1391 | 1212 | * |
| @@ -1453,8 +1274,9 @@ | ||
| 1453 | 1274 | * |
| 1454 | 1275 | * @since 2.5.12 |
| 1455 | 1276 | * |
| 1456 | 1277 | * @param \Elementor\Core\Base\Document $this The current document. |
| 1278 | + * | |
| 1457 | 1279 | */ |
| 1458 | 1280 | do_action( 'elementor/document/save_version', $this ); |
| 1459 | 1281 | } |
| 1460 | 1282 | } |
| @@ -1491,9 +1313,9 @@ | ||
| 1491 | 1313 | * @since 2.0.4 |
| 1492 | 1314 | * @access public |
| 1493 | 1315 | * |
| 1494 | 1316 | * @param string $key Meta data key. |
| 1495 | - * @param mixed $value Meta data value. | |
| 1317 | + * @param string $value Meta data value. | |
| 1496 | 1318 | * |
| 1497 | 1319 | * @return bool|int |
| 1498 | 1320 | */ |
| 1499 | 1321 | public function update_main_meta( $key, $value ) { |
| @@ -1568,21 +1390,13 @@ | ||
| 1568 | 1390 | $date = date_i18n( _x( 'M j, H:i', 'revision date format', 'elementor' ), strtotime( $post->post_modified ) ); |
| 1569 | 1391 | $display_name = get_the_author_meta( 'display_name', $post->post_author ); |
| 1570 | 1392 | |
| 1571 | 1393 | if ( $autosave_post || 'revision' === $post->post_type ) { |
| 1572 | - $last_edited = sprintf( | |
| 1573 | - /* translators: 1: Saving date, 2: Author display name. */ | |
| 1574 | - esc_html__( 'Draft saved on %1$s by %2$s', 'elementor' ), | |
| 1575 | - '<time>' . $date . '</time>', | |
| 1576 | - $display_name | |
| 1577 | - ); | |
| 1394 | + /* translators: 1: Saving date, 2: Author display name. */ | |
| 1395 | + $last_edited = sprintf( esc_html__( 'Draft saved on %1$s by %2$s', 'elementor' ), '<time>' . $date . '</time>', $display_name ); | |
| 1578 | 1396 | } else { |
| 1579 | - $last_edited = sprintf( | |
| 1580 | - /* translators: 1: Editing date, 2: Author display name. */ | |
| 1581 | - esc_html__( 'Last edited on %1$s by %2$s', 'elementor' ), | |
| 1582 | - '<time>' . $date . '</time>', | |
| 1583 | - $display_name | |
| 1584 | - ); | |
| 1397 | + /* translators: 1: Editing date, 2: Author display name. */ | |
| 1398 | + $last_edited = sprintf( esc_html__( 'Last edited on %1$s by %2$s', 'elementor' ), '<time>' . $date . '</time>', $display_name ); | |
| 1585 | 1399 | } |
| 1586 | 1400 | |
| 1587 | 1401 | return $last_edited; |
| 1588 | 1402 | } |
| @@ -1621,9 +1435,9 @@ | ||
| 1621 | 1435 | } else { |
| 1622 | 1436 | $this->post = get_post( $data['post_id'] ); |
| 1623 | 1437 | |
| 1624 | 1438 | if ( ! $this->post ) { |
| 1625 | - throw new \Exception( sprintf( 'Post ID #%s does not exist.', esc_html( $data['post_id'] ) ), Exceptions::NOT_FOUND ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped | |
| 1439 | + throw new \Exception( sprintf( 'Post ID #%s does not exist.', $data['post_id'] ), Exceptions::NOT_FOUND ); | |
| 1626 | 1440 | } |
| 1627 | 1441 | } |
| 1628 | 1442 | |
| 1629 | 1443 | // Each Control_Stack is based on a unique ID. |
| @@ -1641,9 +1455,9 @@ | ||
| 1641 | 1455 | |
| 1642 | 1456 | parent::__construct( $data ); |
| 1643 | 1457 | } |
| 1644 | 1458 | |
| 1645 | - /** | |
| 1459 | + /* | |
| 1646 | 1460 | * Get Export Data |
| 1647 | 1461 | * |
| 1648 | 1462 | * Filters a document's data on export |
| 1649 | 1463 | * |
| @@ -1655,13 +1469,11 @@ | ||
| 1655 | 1469 | public function get_export_data() { |
| 1656 | 1470 | $content = Plugin::$instance->db->iterate_data( $this->get_elements_data(), function( $element_data ) { |
| 1657 | 1471 | $element_data['id'] = Utils::generate_random_string(); |
| 1658 | 1472 | |
| 1659 | - $element_data = apply_filters( 'elementor/document/element/replace_id', $element_data ); | |
| 1660 | - | |
| 1661 | 1473 | $element = Plugin::$instance->elements_manager->create_element_instance( $element_data ); |
| 1662 | 1474 | |
| 1663 | - // If the widget/element does not exist, like a plugin that creates a widget but deactivated. | |
| 1475 | + // If the widget/element isn't exist, like a plugin that creates a widget but deactivated | |
| 1664 | 1476 | if ( ! $element ) { |
| 1665 | 1477 | return null; |
| 1666 | 1478 | } |
| 1667 | 1479 | |
| @@ -1682,9 +1494,9 @@ | ||
| 1682 | 1494 | 'thumbnail' => get_the_post_thumbnail_url( $this->post ), |
| 1683 | 1495 | ]; |
| 1684 | 1496 | } |
| 1685 | 1497 | |
| 1686 | - /** | |
| 1498 | + /* | |
| 1687 | 1499 | * Get Import Data |
| 1688 | 1500 | * |
| 1689 | 1501 | * Filters a document's data on import |
| 1690 | 1502 | * |
| @@ -1749,12 +1561,10 @@ | ||
| 1749 | 1561 | } |
| 1750 | 1562 | } |
| 1751 | 1563 | } |
| 1752 | 1564 | |
| 1753 | - public function process_element_import_export( Controls_Stack $element, $method, $element_data = null ) { | |
| 1754 | - if ( null === $element_data ) { | |
| 1755 | - $element_data = $element->get_data(); | |
| 1756 | - } | |
| 1565 | + private function process_element_import_export( Controls_Stack $element, $method ) { | |
| 1566 | + $element_data = $element->get_data(); | |
| 1757 | 1567 | |
| 1758 | 1568 | if ( method_exists( $element, $method ) ) { |
| 1759 | 1569 | // TODO: Use the internal element data without parameters. |
| 1760 | 1570 | $element_data = $element->{$method}( $element_data ); |
| @@ -1767,17 +1577,10 @@ | ||
| 1767 | 1577 | if ( ! $control_class ) { |
| 1768 | 1578 | return $element_data; |
| 1769 | 1579 | } |
| 1770 | 1580 | |
| 1771 | - // Do not add default value to the final settings, if there is no value at the | |
| 1772 | - // data before the methods `on_import` or `on_export` called. | |
| 1773 | - $has_value = isset( $element_data['settings'][ $control['name'] ] ); | |
| 1774 | - | |
| 1775 | - if ( $has_value && method_exists( $control_class, $method ) ) { | |
| 1776 | - $element_data['settings'][ $control['name'] ] = $control_class->{$method}( | |
| 1777 | - $element_data['settings'][ $control['name'] ], | |
| 1778 | - $control | |
| 1779 | - ); | |
| 1581 | + if ( method_exists( $control_class, $method ) ) { | |
| 1582 | + $element_data['settings'][ $control['name'] ] = $control_class->{$method}( $element->get_settings( $control['name'] ), $control ); | |
| 1780 | 1583 | } |
| 1781 | 1584 | |
| 1782 | 1585 | // On Export, check if the control has an argument 'export' => false. |
| 1783 | 1586 | if ( 'on_export' === $method && isset( $control['export'] ) && false === $control['export'] ) { |
| @@ -1828,92 +1631,18 @@ | ||
| 1828 | 1631 | } |
| 1829 | 1632 | |
| 1830 | 1633 | /** |
| 1831 | 1634 | * @since 2.1.3 |
| 1832 | - * @access public | |
| 1635 | + * @access protected | |
| 1833 | 1636 | */ |
| 1834 | - public function print_elements( $elements_data ) { | |
| 1835 | - $is_element_cache_active = 'disable' !== get_option( 'elementor_element_cache_ttl', '' ); | |
| 1836 | - if ( ! $is_element_cache_active ) { | |
| 1837 | - ob_start(); | |
| 1637 | + protected function print_elements( $elements_data ) { | |
| 1638 | + // Collect all data updaters that should be updated on runtime. | |
| 1639 | + $runtime_elements_iteration_actions = $this->get_runtime_elements_iteration_actions(); | |
| 1838 | 1640 | |
| 1839 | - $this->do_print_elements( $elements_data ); | |
| 1840 | - | |
| 1841 | - $content = ob_get_clean(); | |
| 1842 | - | |
| 1843 | - if ( has_blocks( $content ) ) { | |
| 1844 | - $content = do_blocks( $content ); | |
| 1845 | - } | |
| 1846 | - | |
| 1847 | - echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1848 | - | |
| 1849 | - return; | |
| 1641 | + if ( $runtime_elements_iteration_actions ) { | |
| 1642 | + $this->iterate_elements( $elements_data, $runtime_elements_iteration_actions, 'render' ); | |
| 1850 | 1643 | } |
| 1851 | 1644 | |
| 1852 | - $cached_data = $this->get_document_cache(); | |
| 1853 | - | |
| 1854 | - if ( false === $cached_data ) { | |
| 1855 | - add_filter( 'elementor/element/should_render_shortcode', '__return_true' ); | |
| 1856 | - | |
| 1857 | - $scripts_to_queue = []; | |
| 1858 | - $styles_to_queue = []; | |
| 1859 | - | |
| 1860 | - global $wp_scripts, $wp_styles; | |
| 1861 | - | |
| 1862 | - $should_store_scripts = $wp_scripts instanceof \WP_Scripts && $wp_styles instanceof \WP_Styles; | |
| 1863 | - if ( $should_store_scripts ) { | |
| 1864 | - $scripts_ignored = $wp_scripts->queue; | |
| 1865 | - $styles_ignored = $wp_styles->queue; | |
| 1866 | - } | |
| 1867 | - | |
| 1868 | - ob_start(); | |
| 1869 | - | |
| 1870 | - $this->do_print_elements( $elements_data ); | |
| 1871 | - | |
| 1872 | - if ( $should_store_scripts ) { | |
| 1873 | - $scripts_to_queue = array_values( array_diff( $wp_scripts->queue, $scripts_ignored ) ); | |
| 1874 | - $styles_to_queue = array_values( array_diff( $wp_styles->queue, $styles_ignored ) ); | |
| 1875 | - } | |
| 1876 | - | |
| 1877 | - $cached_data = [ | |
| 1878 | - 'content' => ob_get_clean(), | |
| 1879 | - 'scripts' => $scripts_to_queue, | |
| 1880 | - 'styles' => $styles_to_queue, | |
| 1881 | - ]; | |
| 1882 | - | |
| 1883 | - if ( $this->should_store_cache_elements() ) { | |
| 1884 | - $this->set_document_cache( $cached_data ); | |
| 1885 | - } | |
| 1886 | - | |
| 1887 | - remove_filter( 'elementor/element/should_render_shortcode', '__return_true' ); | |
| 1888 | - } else { | |
| 1889 | - if ( ! empty( $cached_data['scripts'] ) ) { | |
| 1890 | - foreach ( $cached_data['scripts'] as $script_handle ) { | |
| 1891 | - wp_enqueue_script( $script_handle ); | |
| 1892 | - } | |
| 1893 | - } | |
| 1894 | - | |
| 1895 | - if ( ! empty( $cached_data['styles'] ) ) { | |
| 1896 | - foreach ( $cached_data['styles'] as $style_handle ) { | |
| 1897 | - wp_enqueue_style( $style_handle ); | |
| 1898 | - } | |
| 1899 | - } | |
| 1900 | - } | |
| 1901 | - | |
| 1902 | - if ( ! empty( $cached_data['content'] ) ) { | |
| 1903 | - $content = do_shortcode( $cached_data['content'] ); | |
| 1904 | - | |
| 1905 | - if ( has_blocks( $content ) ) { | |
| 1906 | - $content = do_blocks( $content ); | |
| 1907 | - } | |
| 1908 | - | |
| 1909 | - echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1910 | - } | |
| 1911 | - } | |
| 1912 | - | |
| 1913 | - protected function do_print_elements( $elements_data ) { | |
| 1914 | - $this->update_runtime_elements( $elements_data ); | |
| 1915 | - | |
| 1916 | 1645 | foreach ( $elements_data as $element_data ) { |
| 1917 | 1646 | $element = Plugin::$instance->elements_manager->create_element_instance( $element_data ); |
| 1918 | 1647 | |
| 1919 | 1648 | if ( ! $element ) { |
| @@ -1923,75 +1652,8 @@ | ||
| 1923 | 1652 | $element->print_element(); |
| 1924 | 1653 | } |
| 1925 | 1654 | } |
| 1926 | 1655 | |
| 1927 | - public function update_runtime_elements( $elements_data = null ) { | |
| 1928 | - if ( null === $elements_data ) { | |
| 1929 | - $elements_data = $this->get_elements_data(); | |
| 1930 | - } | |
| 1931 | - | |
| 1932 | - // Collect all data updaters that should be updated on runtime. | |
| 1933 | - $runtime_elements_iteration_actions = $this->get_runtime_elements_iteration_actions(); | |
| 1934 | - | |
| 1935 | - if ( $runtime_elements_iteration_actions ) { | |
| 1936 | - $this->iterate_elements( $elements_data, $runtime_elements_iteration_actions, 'render' ); | |
| 1937 | - } | |
| 1938 | - } | |
| 1939 | - | |
| 1940 | - public function set_document_cache( $value ) { | |
| 1941 | - $expiration_hours = get_option( 'elementor_element_cache_ttl', '' ); | |
| 1942 | - | |
| 1943 | - if ( empty( $expiration_hours ) || ! is_numeric( $expiration_hours ) ) { | |
| 1944 | - $expiration_hours = '24'; | |
| 1945 | - } | |
| 1946 | - | |
| 1947 | - $expiration_hours = absint( $expiration_hours ); | |
| 1948 | - | |
| 1949 | - $expiration = '+' . $expiration_hours . ' hours'; | |
| 1950 | - | |
| 1951 | - $data = [ | |
| 1952 | - 'timeout' => strtotime( $expiration, current_time( 'timestamp' ) ), | |
| 1953 | - 'value' => $value, | |
| 1954 | - ]; | |
| 1955 | - | |
| 1956 | - $this->update_json_meta( static::CACHE_META_KEY, $data ); | |
| 1957 | - } | |
| 1958 | - | |
| 1959 | - private function get_document_cache() { | |
| 1960 | - $cache = $this->get_json_meta( static::CACHE_META_KEY ); | |
| 1961 | - | |
| 1962 | - if ( empty( $cache['timeout'] ) ) { | |
| 1963 | - return false; | |
| 1964 | - } | |
| 1965 | - | |
| 1966 | - if ( current_time( 'timestamp' ) > $cache['timeout'] ) { | |
| 1967 | - return false; | |
| 1968 | - } | |
| 1969 | - | |
| 1970 | - if ( ! is_array( $cache['value'] ) ) { | |
| 1971 | - return false; | |
| 1972 | - } | |
| 1973 | - | |
| 1974 | - return $cache['value']; | |
| 1975 | - } | |
| 1976 | - | |
| 1977 | - protected function delete_cache() { | |
| 1978 | - $this->delete_meta( static::CACHE_META_KEY ); | |
| 1979 | - } | |
| 1980 | - | |
| 1981 | - private function should_store_cache_elements() { | |
| 1982 | - static $should_store_cache_elements = null; | |
| 1983 | - | |
| 1984 | - if ( null === $should_store_cache_elements ) { | |
| 1985 | - $should_store_cache_elements = ( | |
| 1986 | - ! is_admin() | |
| 1987 | - && ! Plugin::$instance->preview->is_preview_mode() | |
| 1988 | - ); | |
| 1989 | - } | |
| 1990 | - | |
| 1991 | - return $should_store_cache_elements; | |
| 1992 | - } | |
| 1993 | - | |
| 1994 | 1656 | protected function register_document_controls() { |
| 1995 | 1657 | $this->start_controls_section( |
| 1996 | 1658 | 'document_settings', |
| 1997 | 1659 | [ |
| @@ -2122,10 +1784,6 @@ | ||
| 2122 | 1784 | $this->elements_iteration_actions[] = new Assets_Iteration_Action( $this ); |
| 2123 | 1785 | } |
| 2124 | 1786 | |
| 2125 | 1787 | return $this->elements_iteration_actions; |
| 2126 | - } | |
| 2127 | - | |
| 2128 | - public function get_elementor_version() { | |
| 2129 | - return $this->get_main_meta( '_elementor_version' ); | |
| 2130 | 1788 | } |
| 2131 | 1789 | } |
