Changeset 3443636

Timestamp:

01/20/2026 11:37:48 PM (2 months ago)

Author:

figureone

Message:

Preparing for 3.11.2 release

Location:

insert-pages/trunk

Files:

• insert-pages.php (modified) (7 diffs)
• readme.txt (modified) (2 diffs)

insert-pages/trunk/insert-pages.php

@@ -9 +9 @@
  * License: GPL2
  * Requires at least: 3.3.0
- * Version: 3.11.1
+ * Version: 3.11.2
  *
  * @package insert-pages
@@ -277 +277 @@
          */
         public function insert_pages_handle_shortcode_insert( $atts, $content = null ) {
-            global $wp_query, $post, $wp_current_filter;
+            global $post, $current_screen;
 
             // Shortcode attributes.
@@ -398 +398 @@
                 // title search.
                 if ( is_null( $inserted_page ) ) {
-                    $inserted_pages = get_posts( array(
-                        'title'          => sanitize_text_field( $attributes['page'] ),
-                        'post_type'      => 'any',
-                        'post_status'    => 'any',
-                        'posts_per_page' => 1,
-                    ) );
+                    $inserted_pages = get_posts(
+                        array(
+                            'title'          => sanitize_text_field( $attributes['page'] ),
+                            'post_type'      => 'any',
+                            'post_status'    => 'any',
+                            'posts_per_page' => 1,
+                        )
+                    );
                     if ( ! empty( $inserted_pages ) ) {
                         $inserted_page = $inserted_pages[0];
@@ -561 +563 @@
                     // retrieve generated styles for that post. Reset $post to null
                     // after we're done.
-                    if ( is_null( $post ) ) {
+                    if ( isset( $current_screen->base ) && 'post' === $current_screen->base ) {
+                        // Note: some page builders (e.g., Divi) will try to process
+                        // shortcodes while in the editor, and overwriting the global $post
+                        // can cause issues where the editor will load the inserted page.
+                        // Skip overwriting $post if we are in the editor.
+                        assert( true ); // No-op.
+                    } elseif ( is_null( $post ) ) {
                         $old_post_id = null;
                         $post = $inserted_page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
                     } elseif ( is_int( $post ) ) {
                         $old_post_id = $post;
-                        $post = $inserted_page->ID;
+                        $post = $inserted_page->ID; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
                     } else {
                         $old_post_id = $post->ID;
@@ -656 +664 @@
                     do_action( 'gdlr_core_print_page_builder' );
 
-                    if ( is_null( $old_post_id ) ) {
+                    if ( isset( $current_screen->base ) && 'post' === $current_screen->base ) {
+                        // Note: some page builders (e.g., Divi) will try to process
+                        // shortcodes while in the editor, and overwriting the global $post
+                        // can cause issues where the editor will load the inserted page. Skip
+                        // this if we are in the editor.
+                        assert( true ); // No-op.
+                    } elseif ( is_null( $old_post_id ) ) {
                         $post = null; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
                     } else {
@@ -877 +891 @@
                         // retrieve generated styles for that post. Reset $post to null
                         // after we're done.
-                        if ( is_null( $post ) ) {
+                        if ( isset( $current_screen->base ) && 'post' === $current_screen->base ) {
+                            // Note: some page builders (e.g., Divi) will try to process
+                            // shortcodes while in the editor, and overwriting the global $post
+                            // can cause issues where the editor will load the inserted page.
+                            // Skip overwriting $post if we are in the editor.
+                            assert( true ); // No-op.
+                        } elseif ( is_null( $post ) ) {
                             $old_post_id = null;
                             $post = $inserted_page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
@@ -974 +994 @@
                         do_action( 'gdlr_core_print_page_builder' );
 
-                        if ( is_null( $old_post_id ) ) {
+                        if ( isset( $current_screen->base ) && 'post' === $current_screen->base ) {
+                            // Note: some page builders (e.g., Divi) will try to process
+                            // shortcodes while in the editor, and overwriting the global $post
+                            // can cause issues where the editor will load the inserted page.
+                            // Skip overwriting $post if we are in the editor.
+                            assert( true ); // No-op.
+                        } elseif ( is_null( $old_post_id ) ) {
                             $post = null; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
                         } elseif ( is_int( $post ) ) {
-                            $post = $old_post_id;
+                            $post = $old_post_id; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
                         } else {
                             $post->ID = $old_post_id;

insert-pages/trunk/readme.txt

@@ -3 +3 @@
 Tags: insert, pages, shortcode, embed
 Tested up to: 6.9
-Stable tag: 3.11.1
+Stable tag: 3.11.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -110 +110 @@
 
 == Changelog ==
+
+= 3.11.2 =
+* Fix for Divi redirecting to inserted page when an Insert Pages shortcode exists in the classic editor. Props airflo for the [report](https://github.com/uhm-coe/insert-pages/issues/65)!
 
 = 3.11.1 =