From 2e7232aa9a4b336d17778e483e51939a4e2da613 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Tue, 24 Dec 2013 02:24:14 -0800
Subject: [PATCH] Improved check for Bootstrap3

---
 e107_admin/newspost.php         | 2 +-
 e107_handlers/e_parse_class.php | 2 +-
 e107_handlers/form_handler.php  | 6 +++---
 usersettings.php                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index fbd86a688..1646e0f99 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -101,7 +101,7 @@ class news_cat_ui extends e_admin_ui
          
          	'category_meta_description' => array('title'=> LAN_DESCRIPTION,		'type' => 'textarea',			'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>FALSE),
 			'category_meta_keywords' 	=> array('title'=> LAN_KEYWORDS,		'type' => 'text',			'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE),		
-			'category_sef' 				=> array('title'=> LAN_SEFURL,	'type' => 'text',			'width' => 'auto', 'readonly'=>FALSE), // Display name
+			'category_sef' 				=> array('title'=> LAN_SEFURL,	'type' => 'text',	'inline'=>true,		'width' => 'auto', 'readonly'=>FALSE), // Display name
 			'category_manager' 			=> array('title'=> "Manage Permissions",'type' => 'userclass',		'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE),
 			'category_order' 			=> array('title'=> LAN_ORDER,			'type' => 'text',			'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ),										
 			'options' 					=> array('title'=> LAN_OPTIONS,			'type' => null,				'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center', 'sort' => true)
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 32e868625..a6f777042 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2678,7 +2678,7 @@ class e_parser
 				$cls = str_replace('icon-', 'fa fa-', $cls);
 			}
 
-			$text = (deftrue('BOOTSTRAP') == 3) ? "<span class='".$cls."'></span>"  : "<i class='".$cls."'></i>";	// retain space. 
+			$text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>"  : "<i class='".$cls."'></i>";	// retain space. 
 			$text .= ($space !== false) ? $space : "";
 			
 			return $text;
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index c41a324c4..506175bf3 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -200,7 +200,7 @@ class e_form
 			$options['class'] = "tbox";		
 		}
 
-		if(deftrue('BOOTSTRAP') == 3)
+		if(deftrue('BOOTSTRAP') === 3)
 		{
 			$options['class'] = 'form-control';
 		}
@@ -1631,7 +1631,7 @@ class e_form
 			}	
 		}
 	
-		$sep = (deftrue('BOOTSTRAP') == 3) ? "" : "<span class='divider'>/</span>";
+		$sep = (deftrue('BOOTSTRAP') === 3) ? "" : "<span class='divider'>/</span>";
 	
 		$text .= implode($sep."</li><li>",$opt); 
 	
@@ -1937,7 +1937,7 @@ class e_form
 			//	'multiple' => false, - see case 'select'
 		);
 
-		$form_control = (deftrue('BOOTSTRAP') == 3) ? ' form-control' : '';
+		$form_control = (deftrue('BOOTSTRAP') === 3) ? ' form-control' : '';
 
 		switch ($type) {
 			case 'hidden':
diff --git a/usersettings.php b/usersettings.php
index bcc29d6de..35f7ad092 100644
--- a/usersettings.php
+++ b/usersettings.php
@@ -60,7 +60,7 @@ $userMethods = e107::getUserSession();
 require_once (e_HANDLER.'ren_help.php');
 
 
-if(deftrue('BOOTSTRAP')==3)
+if(deftrue('BOOTSTRAP')===3)
 {
 	$template = e107::getCoreTemplate('usersettings','', true, true); // always merge