From 73bb794b677a89879f647fb4b13c5a0ced1ee481 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Tue, 19 Mar 2013 19:05:58 -0700
Subject: [PATCH] Better bootstrap detection.

---
 e107_handlers/e107_class.php    | 2 +-
 e107_handlers/e_parse_class.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 00354db61..88047d5b0 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -1587,7 +1587,7 @@ class e107
 	 */
 	public static function css($type, $data, $dep = null, $media = 'all', $preComment = '', $postComment = '', $dependence = null)
 	{
-		if(strstr($data,'bootstrap') && !defined("e_BOOTSTRAP")) // detect bootstrap is enabled. - used in nextprev.sc currently. 
+		if((strstr($data,'bootstrap.css') || strstr($data,'bootstrap.min.css')) && !defined("e_BOOTSTRAP")) // detect bootstrap is enabled. - used in nextprev.sc and forum currently. 
 		{
 			define("e_BOOTSTRAP", true);	
 		}
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 5e448f190..ec5466bb5 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2424,6 +2424,7 @@ class e_parser
 		
 		$doc = $this->domObj;   
 		       
+		$doc->preserveWhiteSpace = true;
         $doc->loadHTML($html); 	
 	
 		$tg = explode(",", $taglist);