From abf125d2fc96c4b60aefdfe3d56e9d119ff19f7b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 30 Dec 2016 14:45:54 -0800
Subject: [PATCH] PHP warning removal and social/e_header.php added to
 deprecated list.

---
 e107_admin/admin.php                    | 3 ++-
 e107_plugins/featurebox/e_shortcode.php | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 06675558a..baba63307 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -135,7 +135,8 @@ class admin_start
 			e_PLUGIN."online_extended_menu/images/user.png",
 			e_PLUGIN."online_extended_menu/languages/English.php",
 			e_PLUGIN."pm/sendpm.sc",
-			e_PLUGIN."pm/shortcodes/"
+			e_PLUGIN."pm/shortcodes/",
+			e_PLUGIN."social/e_header.php"
 
 		);
 
diff --git a/e107_plugins/featurebox/e_shortcode.php b/e107_plugins/featurebox/e_shortcode.php
index 2697cd791..cf9032f7b 100644
--- a/e107_plugins/featurebox/e_shortcode.php
+++ b/e107_plugins/featurebox/e_shortcode.php
@@ -53,8 +53,11 @@ class featurebox_shortcodes// must match the plugin's folder name. ie. [PLUGIN_F
 		{
 			$ctemplate = $mod;
 		}
-		
-		parse_str($parm, $parm);
+
+		if(is_string($parm))
+		{
+			parse_str($parm, $parm);
+		}
 		
 		$category = $this->getCategoryModel($ctemplate, (vartrue($parm['force']) ? true : false));
 		$defopt = array(