From 20d8aec3ba04a2a6d5821af91df10122e3c8ec3b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 14 Nov 2014 18:13:18 -0800
Subject: [PATCH] Notice and Error removal.

---
 e107_handlers/chart_class.php |  2 +-
 e107_handlers/e107_class.php  | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/e107_handlers/chart_class.php b/e107_handlers/chart_class.php
index 3d900aaff..e62c07fda 100644
--- a/e107_handlers/chart_class.php
+++ b/e107_handlers/chart_class.php
@@ -224,7 +224,7 @@ class e_chart
 	 * @param array $data
 	 * @param string $id of canvas element
 	 */
-	public function setData($data,$id)
+	public function setData($data)
 	{
 		$this->id = $id;
 		if($data == 'demo')
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index a9fcf9db2..ce44e6fa3 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -1449,8 +1449,13 @@ class e107
     * @return string
     */
     public static function serialize($ArrayData, $AddSlashes = false) 
-    {       
-       return self::getArrayStorage()->serialize($ArrayData, $AddSlashes); 
+    {
+    	if(empty($ArrayData))
+		{
+			return array();	
+		}			
+		       
+		return self::getArrayStorage()->serialize($ArrayData, $AddSlashes); 
     }
 	
 	  /**
@@ -1460,8 +1465,13 @@ class e107
     * @return array stored data
     */
     public static function unserialize($ArrayData) 
-    {       
-       return self::getArrayStorage()->unserialize($ArrayData); 
+    {
+    	if(empty($ArrayData))
+		{
+			return array();	
+		}	
+		       
+		return self::getArrayStorage()->unserialize($ArrayData); 
     }