Changeset 3491564

Timestamp:

03/26/2026 08:21:24 AM (2 days ago)

Author:

wpdevelop

Message:

Update 10.15.2

Location:

booking/trunk

Files:

• includes/page-form-builder/save-load/bfb-activate.php (modified) (7 diffs)
• includes/publish/wpbc-create-pages.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wpdev-booking.php (modified) (2 diffs)

booking/trunk/includes/page-form-builder/save-load/bfb-activate.php

@@ -184 +184 @@
 }
 
+
+/**
+ * Force a safe template for the BFB Preview page.
+ *
+ * Why:
+ * - The Preview page is a technical/service page.
+ * - It should not inherit decorative page templates like "Page with wide Image".
+ * - For block themes, prefer a clean template like "page-no-title" or "page".
+ * - For classic themes, use the default page template.  // FixIn: 10.15.2.1
+ *
+ * @param int $page_id Page ID.
+ *
+ * @return bool
+ */
+function wpbc_bfb_preview__force_safe_template( $page_id ) {
+
+    $page_id = absint( $page_id );
+
+    if ( $page_id <= 0 ) {
+        return false;
+    }
+
+    /*
+     * Always clear any previously assigned template first.
+     * This is important when an existing Preview page was previously using
+     * an unwanted template, for example "Page with wide Image".
+     */
+    delete_post_meta( $page_id, '_wp_page_template' );
+
+    // Block themes: prefer a cleaner built-in page template, if available.
+    if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() && function_exists( 'get_block_templates' ) ) {
+
+        $theme_slug        = get_stylesheet();
+        $templates         = get_block_templates(
+            array(
+                'post_type' => 'page',
+            ),
+            'wp_template'
+        );
+        $safe_template_slug = '';
+
+        foreach ( $templates as $template ) {
+
+            if ( empty( $template->slug ) || empty( $template->theme ) ) {
+                continue;
+            }
+
+            if ( $theme_slug !== $template->theme ) {
+                continue;
+            }
+
+            if ( 'page-no-title' === $template->slug ) {
+                $safe_template_slug = 'page-no-title';
+                break;
+            }
+
+            if ( ( '' === $safe_template_slug ) && ( 'page' === $template->slug ) ) {
+                $safe_template_slug = 'page';
+            }
+        }
+
+        if ( '' !== $safe_template_slug ) {
+            $result = wp_update_post(
+                array(
+                    'ID'            => $page_id,
+                    'page_template' => $safe_template_slug,
+                ),
+                true
+            );
+
+            return ( ! is_wp_error( $result ) );
+        }
+    }
+
+    return true;
+}
+
+
 /**
  * The preview page has status 'publish', because the secure the output by your nonce + cap
@@ -213 +291 @@
     if ( ( ! is_wp_error( $page_id ) ) && ( ! empty( $page_id ) ) ) {
         // Success.
-        wpbc_try_assign_full_width_template(
-            $page_id,
-            array(
-                'excluded_title_parts'             => array( 'wide image' ),
-                'excluded_classic_template_files'  => array( 'elementor_header_footer' ),
-                'force_elementor_default_template' => true,
-            )
-        );
+        wpbc_bfb_preview__force_safe_template( $page_id );
     } else {
         if ( is_wp_error( $page_id ) ) {
@@ -236 +307 @@
 
 /**
- * Create the private "Booking Form Preview" page and store option.
+ * Create the "Booking Form Preview" page and store option.
  *
  * @return int|false Page ID on success, false on failure.
@@ -249 +320 @@
     wpbc_bfb_activation__restore_user( $prev_user_id );
 
-    if ( is_wp_error( $page_id ) ) {
+    if ( empty( $page_id ) || is_wp_error( $page_id ) ) {
         return false;
     }
@@ -292 +363 @@
 
         // Ensure meta marker exists.
+        wpbc_bfb_preview__force_safe_template( (int) $page_id );
         add_post_meta( (int) $page_id, wpbc_bfb_activation__get_preview_page_meta_key(), '1', true );
 
@@ -300 +372 @@
     $found_id = wpbc_bfb_activation__find_preview_page_by_meta();
     if ( $found_id > 0 && wpbc_bfb_activation__is_valid_page_id( $found_id ) ) {
+        $found_page = get_post( $found_id );
+        if ( $found_page instanceof WP_Post && 'publish' !== $found_page->post_status ) {
+            wp_update_post( array(
+                'ID'          => (int) $found_id,
+                'post_status' => 'publish',
+            ) );
+        }
+        wpbc_bfb_preview__force_safe_template( (int) $found_id );
         update_option( $option_key, (int) $found_id );
         return (int) $found_id;
@@ -307 +387 @@
     $found_id = wpbc_bfb_activation__find_preview_page_by_slug();
     if ( $found_id > 0 && wpbc_bfb_activation__is_valid_page_id( $found_id ) ) {
+        $found_page = get_post( $found_id );
+        if ( $found_page instanceof WP_Post && 'publish' !== $found_page->post_status ) {
+            wp_update_post( array(
+                'ID'          => (int) $found_id,
+                'post_status' => 'publish',
+            ) );
+        }
+        wpbc_bfb_preview__force_safe_template( (int) $found_id );
         // Mark it as ours (so next time meta lookup works).
         add_post_meta( (int) $found_id, wpbc_bfb_activation__get_preview_page_meta_key(), '1', true );

booking/trunk/includes/publish/wpbc-create-pages.php

@@ -223 +223 @@
             wp_update_post(
                 array(
-                    'ID'       => $post_id,
-                    'template' => $template->slug,
+                    'ID'            => $post_id,
+                    'page_template' => $template->slug,
                 )
             );

booking/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 5.6
 Tested up to: 7.0
-Stable tag: 10.15.1
+Stable tag: 10.15.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -336 +336 @@
 
 == Changelog ==
+= 10.15.2 =
+- Changes in **all** versions:
+    * **New**: Force a safe template for the BFB Preview page. (10.15.2.1)
+
 = 10.15.1 =
 - Changes in **all** versions:

booking/trunk/wpdev-booking.php

@@ -8 +8 @@
 Text Domain: booking
 Domain Path: /languages/
-Version: 10.15.1
+Version: 10.15.2
 License: GPLv2 or later
 */
@@ -35 +35 @@
 
 if ( ! defined( 'WP_BK_VERSION_NUM' ) ) {
-    define( 'WP_BK_VERSION_NUM', '10.15.1' );
+    define( 'WP_BK_VERSION_NUM', '10.15.2' );
 }
 if ( ! defined( 'WP_BK_MINOR_UPDATE' ) ) {