Merge branch 'fix/search' into staging

Author: jaymcp

wp-content/themes/humanity-theme/includes/features/search/class-search-page.php

@@ -58,7 +58,11 @@ public function get_wp_query(): ?WP_Query {
 			return $this->query;
 		}
 
-		$this->query = new WP_Query( $this->get_query_vars() );
+		if ( get_query_var( 's' ) ) {
+			$this->query = $GLOBALS['wp_query'];
+		} else {
+			$this->query = new WP_Query( $this->get_query_vars() );
+		}
 
 		$search_page_id = absint( get_option( 'amnesty_search_page' ) );
 

wp-content/themes/humanity-theme/includes/features/search/post-excerpt.php

@@ -24,7 +24,7 @@ function get_first_paragraph( string $html ): string {
 
 		libxml_use_internal_errors( true );
 		$doc->loadHTML(
-			mb_convert_encoding( $html, 'HTML-ENTITIES', 'UTF-8' ),
+			$html,
 			LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOXMLDECL | LIBXML_NOERROR | LIBXML_NOWARNING
 		);
 		libxml_use_internal_errors( false );

wp-content/themes/humanity-theme/patterns/search.php

@@ -119,7 +119,7 @@
 					<div class="wp-block-group post-byline wp-block-post-date">
 						<!-- wp:paragraph -->
 						<p class="wp-block-paragraph">
-							<time datetime="<?php echo esc_attr( get_the_modified_date( 'c' ) ); ?>"><?php echo esc_html( get_the_modified_date() ); ?></time>
+							<time datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time>
 						</p>
 						<!-- /wp:paragraph -->
 					</div>