From de1490de7134bb90a987f2654d9fd296f7d02756 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 4 Jan 2017 11:03:51 -0800
Subject: [PATCH] Fix for forum not displaying.

---
 e107_core/shortcodes/batch/contact_shortcodes.php | 8 ++++++--
 e107_plugins/forum/forum.php                      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/e107_core/shortcodes/batch/contact_shortcodes.php b/e107_core/shortcodes/batch/contact_shortcodes.php
index bb0c341c5..fb425bff8 100644
--- a/e107_core/shortcodes/batch/contact_shortcodes.php
+++ b/e107_core/shortcodes/batch/contact_shortcodes.php
@@ -116,9 +116,13 @@ class contact_shortcodes extends e_shortcode
 	}
 	
 	
-	function sc_contact_body($parm='')
+	function sc_contact_body($parm=null)
 	{
-		parse_str($parm, $parm);
+		if(is_string($parm))
+		{
+			parse_str($parm, $parm);
+		}
+
 		$rows = vartrue($parm['rows'],10);
 		$cols = vartrue($parm['cols'],70);
 		$placeholder = !empty($parm['placeholder']) ? "placeholder=\"".$parm['placeholder']."\"" : "";
diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php
index d60545b56..e5fc95adc 100644
--- a/e107_plugins/forum/forum.php
+++ b/e107_plugins/forum/forum.php
@@ -330,7 +330,7 @@ if(empty($FORUM_TEMPLATE))
 	}
 }
 
-if(is_array($FORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // new v2.x format. 
+if(is_array($FORUM_TEMPLATE)) // new v2.x format.
 {
 
 	if(varset($FORUM_TEMPLATE['main-start'])) // correction of previous v2.x setup.