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

2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es> 

* operation/integria_incidents/incident.list.php: Fixed a problem with
	incident search, in incident integrated with Integria.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7169 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-11-20 12:59:59 +00:00
parent 2af04c7514
commit 70e7f441c1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.list.php: Fixed a problem with
incident search, in incident integrated with Integria.
MERGED FROM 4.0.2
2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es> 2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.incident.php, * operation/integria_incidents/incident.incident.php,

2
pandora_console/operation/integria_incidents/incident.list.php
View File

@ -109,7 +109,7 @@ if(isset($result['incident'][0]) && is_array($result['incident'][0])){
$incidents = $result['incident']; $incidents = $result['incident'];
} }
else { else {
$incidents = $result; $incidents = array($result['incident']);
} }
$rowPair = true; $rowPair = true;