From 65600fa77e8c659d48575df7a2b849bac5a78123 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 19 Jun 2012 09:49:49 +0000 Subject: [PATCH] 2012-06-19 Sergio Martin * include/functions_incidents.php: Changed a parameter of the xml2array function to set it equal to recent fix in 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/include/functions_incidents.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c3ec235f66..64f867d8a6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-06-19 Sergio Martin + + * include/functions_incidents.php: Changed a parameter + of the xml2array function to set it equal to recent + fix in 4.0.2 + 2012-06-19 Miguel de Dios * godmode/reporting/reporting_builder.list_items.php: some fixes. diff --git a/pandora_console/include/functions_incidents.php b/pandora_console/include/functions_incidents.php index a89d0ee4e9..3d41c0ea08 100644 --- a/pandora_console/include/functions_incidents.php +++ b/pandora_console/include/functions_incidents.php @@ -442,7 +442,7 @@ function incidents_call_api($url, $postparameters = false) { * @return array A Json encoded array with xml content. */ function incidents_xml_to_array($xml) { - $xmlObj = simplexml_load_string($xml, null, LIBXML_NOCDATA); + $xmlObj = simplexml_load_string($xml,'SimpleXMLElement',LIBXML_NOCDATA); return json_decode(json_encode($xmlObj), true); }