From 7376e8e40e68ad61a74191c2580c0444645b0cf6 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 17 Feb 2016 11:33:00 -0800
Subject: [PATCH] Notice removal.

---
 e107_core/shortcodes/batch/admin_shortcodes.php | 2 +-
 e107_handlers/chart_class.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 40daf52a3..8ee1a1c97 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -1803,7 +1803,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			
 		}	
 		
-		return $menu_vars;
+		return !empty($menu_vars) ? $menu_vars : null;
 	}
 
 
diff --git a/e107_handlers/chart_class.php b/e107_handlers/chart_class.php
index 08e8363bb..b113b3079 100644
--- a/e107_handlers/chart_class.php
+++ b/e107_handlers/chart_class.php
@@ -228,7 +228,7 @@ class e_chart
 	 */
 	public function setData($data)
 	{
-		$this->id = $id;
+	//	$this->id = $id;
 		if($data == 'demo')
 		{
 			$this->data = $this->getDemoData();