Merge pull request #151 from BoldGrid/issue-150

Temp workaround for issue-150

Author: avonville

assets/js/gutenblock.js

@@ -174,7 +174,7 @@
              * Create the div container, add an overlay so the user can interact
              * with the form in Gutenberg, then render the iframe with form
              */
-            if( '' === formID ) {
+             if ( '' === formID ) {
                 children.push( el( 'div', {style : {width: '100%'}},
                     el( 'img', { className: 'weforms-block-logo', src: weFormsBlock.block_logo}),
                     el ( 'div', null, 'weForms Forms'),
@@ -184,7 +184,7 @@
                 children.push(
                     el( 'div', { className: 'weforms-iframe-container' },
                         el( 'div', { className: 'weforms-iframe-overlay' } ),
-                        el( 'iframe', { src: weFormsBlock.siteUrl + '?weforms_preview=1&weforms_iframe&form_id=' + formID, height: '0', width: '500', scrolling: 'no' })
+                        el( 'iframe', { src: weFormsBlock.siteUrl + '/?weforms_preview=1&weforms_iframe&form_id=' + formID, height: '0', width: '500', scrolling: 'no' })
                     )
                 )
             }

includes/admin/class-gutenblock.php

@@ -57,15 +57,16 @@ public function weforms_form_block() {
             ];
         }
 
-        $block_logo     = WEFORMS_ASSET_URI . '/images/icon-weforms.png';
-        $thumbnail_logo = WEFORMS_ASSET_URI . '/images/icon-weforms.png';
-
-        wp_localize_script( 'weforms-forms-block', 'weFormsBlock', [
-            'forms'          => $forms,
-            'siteUrl'        => get_home_url(),
-            'block_logo'     => $block_logo,
-            'thumbnail_logo' => $thumbnail_logo,
-        ] );
+        $block_logo      = WEFORMS_ASSET_URI . '/images/icon-weforms.png';
+        $thumbnail_logo  = WEFORMS_ASSET_URI . '/images/icon-weforms.png';
+
+        wp_localize_script( 'weforms-forms-block', 'weFormsBlock', array(
+            'forms'           => $forms,
+            'siteUrl'         => get_home_url(),
+            'block_logo'      => $block_logo,
+            'thumbnail_logo'  => $thumbnail_logo,
+            'did_wp_head_run' => $did_wp_head_run,
+        ) );
         wp_enqueue_style( 'weforms-forms-block-style' );
         wp_enqueue_style( 'weforms-forms-block-editor' );
     }

includes/class-form-preview.php

@@ -61,12 +61,12 @@ public function __construct() {
             $this->form_id = isset( $_GET['form_id'] ) ? intval( $_GET['form_id'] ) : 0;
         }
 
-        add_action( 'pre_get_posts', [ $this, 'pre_get_posts' ] );
-        add_filter( 'template_include', [ $this, 'template_include' ] );
-
-        add_filter( 'the_title', [ $this, 'the_title' ] );
-        add_filter( 'the_content', [ $this, 'the_content' ] );
-        add_filter( 'get_the_excerpt', [ $this, 'the_content' ] );
+        add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
+        add_filter( 'the_title', array( $this, 'the_title' ) );
+        add_filter( 'the_content', array( $this, 'the_content' ) );
+        add_filter( 'get_the_excerpt', array( $this, 'the_content' ) );
+        add_filter( 'home_template_hierarchy', array( $this, 'use_page_template_hierarchy' ) );
+		add_filter( 'frontpage_template_hierarchy', array( $this, 'use_page_template_hierarchy' ) );
         add_filter( 'post_thumbnail_html', '__return_empty_string' );
     }
 
@@ -129,12 +129,31 @@ public function pre_get_posts( $query ) {
         }
     }
 
+
+    /**
+	 * Use page template types.
+     *
+     * Instead of just locating one page template with the highest priority,
+     * we are going to look for any page template that matches 'page.php', 'single.php' or 'index.php'.
+     * This resolves issues with Block Based themes that do not have a index.php.
+	 *
+	 * @since 1.6.12
+	 * @param array $templates The list of templates in descending order of priority from WordPress.
+	 *
+	 * @return array
+	 */
+	public function use_page_template_hierarchy( $templates ) {
+
+		return array( 'page.php', 'single.php', 'index.php' );
+	}
     /**
      * Limit the page templates to singular pages only
      *
+     * @deprecated 1.6.11
      * @return string
      */
-    public function template_include() {
-        return locate_template( [ 'page.php', 'single.php', 'index.php' ] );
+    public function template_include( ) {
+        _deprecated_function( __METHOD__, 'WeForms 1.6.11' );
+        return locate_template( array( 'page.php', 'single.php', 'index.php' ) );
     }
 }