Merge branch 'release/2.11.7'

siteorigin · Dec 7, 2020 · 6ab797e · 6ab797e
2 parents 68147e8 + e0f138c
commit 6ab797e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/inc/admin.php b/inc/admin.php
@@ -198,6 +198,8 @@ function add_meta_boxes() {
 	 */
 	function render_meta_boxes( $post ) {
 		$panels_data = $this->get_current_admin_panels_data();
+		$preview_url = SiteOrigin_Panels::preview_url();
+		$preview_content = $this->generate_panels_preview( $post->ID, $panels_data );
 		include plugin_dir_path( __FILE__ ) . '../tpl/metabox-panels.php';
 	}
 

diff --git a/readme.txt b/readme.txt
@@ -97,10 +97,13 @@ We've tried to ensure that Page Builder is compatible with most plugin widgets.
 
 == Changelog ==
 
+= 2.11.7 - 07 December 2020 =
+* SEO: Generated `preview_url` before `preview_content`. Resolves Live Editor preview issue when a post loop is present in the page.
+
 = 2.11.6 - 01 December 2020 =
-* New: "Page Builder Layout CSS Output Location" setting that controls where PB outputs its CSS. Located at `Settings > Page Builder > Layout`.
+* New: `Page Builder Layout CSS Output Location` setting that controls where PB outputs its CSS. Located at `Settings > Page Builder > Layout`.
 * SEO: Improved content analysis process for slower servers and connections.
-* SEO: Excluded <iframe>, <script>, <link>, <style> from content analysis due to word count inflation.
+* SEO: Excluded `<iframe>, <script>, <link>, <style>` from content analysis due to word count inflation.
 * Developer: Added `wp-color-picker` as an editor dependency.
 * Developer: Introduced a new Ajax Response filter `siteorigin_panels_layouts_result`.
 * Developer: Standardized SO Layout Block variables to avoid conflicts with other blocks.

diff --git a/tpl/metabox-panels.php b/tpl/metabox-panels.php
@@ -3,13 +3,12 @@
 $builder_id = uniqid();
 $builder_type = apply_filters( 'siteorigin_panels_post_builder_type', 'editor_attached', $post, $panels_data );
 $builder_supports = apply_filters( 'siteorigin_panels_builder_supports', array(), $post, $panels_data );
-$preview = SiteOrigin_Panels_Admin::single()->generate_panels_preview( $post->ID, $panels_data );
 ?>
 
 <div id="siteorigin-panels-metabox"
 	data-builder-type="<?php echo esc_attr( $builder_type ) ?>"
-	data-preview-url="<?php echo SiteOrigin_Panels::preview_url() ?>"
-	data-preview-markup="<?php echo esc_attr( json_encode( $preview ) ); ?>"
+	data-preview-url="<?php echo $preview_url; ?>"
+	data-preview-markup="<?php echo esc_attr( json_encode( $preview_content ) ); ?>"
 	data-builder-supports="<?php echo esc_attr( json_encode( $builder_supports ) ) ?>"
 	<?php if( !empty( $_GET['so_live_editor'] ) ) echo 'data-live-editor="1"' ?>
 	>