Merge branch 'develop' into pr/new-config-format

classes/display/JSONDisplayHandler.php

@@ -9,14 +9,49 @@ class JSONDisplayHandler
 	 * @param ModuleObject $oModule the module object
 	 * @return string
 	 */
-	function toDoc(&$oModule)
+	public function toDoc($oModule)
 	{
 		$variables = $oModule->getVariables();
 		$variables['error'] = $oModule->getError();
 		$variables['message'] = $oModule->getMessage();
-		return json_encode($variables);
+		
+		$temp = array();
+		foreach ($variables as $key => $value)
+		{
+			if (self::_isNumericArray($value))
+			{
+				$temp[$key] = array_values($value);
+			}
+			else
+			{
+				$temp[$key] = $value;
+			}
+		}
+		
+		return json_encode($temp);
+	}
+	
+	/**
+	 * Check if an array only has numeric keys.
+	 * 
+	 * @param array $array
+	 * @return bool
+	 */
+	protected static function _isNumericArray($array)
+	{
+		if (!is_array($array) || !count($array))
+		{
+			return false;
+		}
+		foreach ($array as $key => $value)
+		{
+			if (!is_numeric($key))
+			{
+				return false;
+			}
+		}
+		return true;
 	}
-
 }
 /* End of file JSONDisplayHandler.class.php */
 /* Location: ./classes/display/JSONDisplayHandler.class.php */