Merge branch '1.x'

washingtonstateuniversity · Nov 1, 2023 · 4bca5f7 · 4bca5f7
2 parents 6becde1 + 17833b3
commit 4bca5f7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/includes/html-snippet-block.php b/includes/html-snippet-block.php
@@ -35,15 +35,6 @@ public static function render( $attrs, $content = '' )
             }
         }
 
-        if ($the_query->have_posts() ) {
-
-            while ( $the_query->have_posts() ) {
-                $the_query->the_post();
-
-                the_content();
-            }
-        }
-
         // Restore original Post Data.
         wp_reset_postdata();
 

diff --git a/wsuwp-html-snippets.php b/wsuwp-html-snippets.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: WSU HTML Snippets
-Version: 1.2.5
+Version: 1.2.6
 Description: Embed common HTML content throughout a WordPress site.
 Author: washingtonstateuniversity, jeremyfelt
 Author URI: https://web.wsu.edu/
@@ -135,17 +135,35 @@ public function display_html_snippet( $atts ) {
 		if ( ( empty( $atts['id'] ) || 0 === absint( $atts['id'] ) ) ) {
 			return '';
 		}
+
 
-		$post = get_post( $atts['id'] );
+		$args = array(
+            'p' => $atts['id'],
+            'post_type' => 'wsu_html_snippet',
+        );
+
+        $the_query = new WP_Query( $args );
+
+        ob_start();
+
+        if ( $the_query->have_posts() ) {
+
+            while ( $the_query->have_posts() ) {
+                $the_query->the_post();
+
+                the_content();
+            }
+        }
+
+        // Restore original Post Data.
+        wp_reset_postdata();
+
+        $content = ob_get_clean();
 
 		if ( is_multisite() && ms_is_switched() ) {
 			restore_current_blog();
 		}
 
-		if ( ! $post || $this::$content_type_slug !== $post->post_type ) {
-			return '';
-		}
-
 		if ( in_array( $atts['container'], array( 'div', 'span' ) ) ) {
 			$container_open = '<' . $atts['container'];
 
@@ -159,19 +177,12 @@ public function display_html_snippet( $atts ) {
 
 			$container_open .= '>';
 
-			$content = $container_open .  apply_filters( 'the_content', $post->post_content ) . '</' . $atts['container'] . '>';
-			$content = do_shortcode( $content );
-		} else {
-			$content = apply_filters( 'the_content', $post->post_content );
-			$content = do_shortcode( $content );
-		}
-
+			$content = $container_open .  $content . '</' . $atts['container'] . '>';
 
-		if ( ! has_filter( 'the_content', 'wpautop' ) ) {
-			$content = wpautop( $content );
 		}
 
 		return $content;
+
     }
 
 	/**