tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-06-19 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2012-06-19 09:49:49 +00:00
parent fed40c748e
commit 33d048263e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-06-19 Sergio Martin <sergio.martin@artica.es>
* 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 <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.list_items.php: some fixes.

2
pandora_console/include/functions_incidents.php
View File

@ -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);
}