Merge branch 'master' of github.com:ThemeFuse/Unyson-PageBuilder-Extension

Author: Viorel

class-fw-extension-page-builder.php

@@ -264,6 +264,12 @@ public function _theme_filter_fw_shortcode_atts( $atts ) {
 	 */
 	public function _theme_filter_prevent_autop( $content ) {
 		if ( $this->is_builder_post() ) {
+			if (!apply_filters(
+				'fw_ext_page_builder_output_content_wrapper', true
+			)) {
+				return $content;
+			}
+
 			$wrapper_class = apply_filters( 'fw_ext_page_builder_content_wrapper_class', 'fw-page-builder-content' );
 
 			/**

includes/page-builder/includes/item-types/simple/static/js/scripts.js

@@ -40,7 +40,7 @@
 						'<% } %>' +
 					'<% } %>' +
 
-					'<%= title %>' +
+					'<span><%= title %></span>' +
 					'<div class="controls">' +
 
 						'<% if (hasOptions) { %>' +

includes/page-builder/includes/items-corrector/class-page-builder-items-corrector.php

@@ -205,7 +205,11 @@ private function correct_root_items()
 						if (
 							($shortcode_instance = $shortcodes_extension->get_shortcode($items[$i]['shortcode']))
 							&&
-							$shortcode_instance->get_config('page_builder/disable_correction')
+							(
+								$shortcode_instance->get_config('page_builder/disable_correction')
+								||
+								$shortcode_instance->get_config('page_builder/disable_root_correction')
+							)
 						) {
 							$fixed_items[] = $items[$i];
 						} else {