Merge pull request #77 from Jorenm/master

Tweak to the doctype issue fix.

themes/theopenstandard/content-filters.php

@@ -8,6 +8,10 @@ function startsWith($haystack, $needle) {
 
 	// Parse out consequtive p::content and put them into block grids.
 	function add_block_grids($content) {
+
+		$content = mb_convert_encoding($content, 'utf-8', mb_detect_encoding($content));
+		$content = mb_convert_encoding($content, 'html-entities', 'utf-8');
+
 		$content = qp($content);
 		$blocks = $content->xpath("//p[starts-with(.,'::')]");
 
@@ -20,9 +24,9 @@ function add_block_grids($content) {
 
 			$innerHTML = str_replace('::', '', $block->html());
 
-			if ($block_group 
+			if ($block_group
 				&& (
-					count($prev) 
+					count($prev)
 					&& startsWith($prev->text(), '::')
 				)
 			) {
@@ -44,8 +48,8 @@ function add_block_grids($content) {
 			$block->replaceWith($block_grid);
 		}
 
-		return $content->html();
+		return $content->find('body')->innerHTML();
 	}
 
     add_filter('the_content', 'add_block_grids');
-?>
+?>