MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.2.36' into develop 

Conflicts:
	app/Controller/AppController.php
pull/304/merge
iglocska 2014-08-14 17:29:21 +02:00
parent 62ad489e47 1e6c9e662f
commit 63cebad0b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/AppController.php
View File

@ -45,8 +45,8 @@ class AppController extends Controller {
// Used for _isAutomation(), a check that returns true if the controller & action combo matches an action that is a non-xml and non-json automation method
// This is used to allow authentication via headers for methods not covered by _isRest() - as that only checks for JSON and XML formats
public $automationArray = array(
'events' => array('csv', 'nids', 'hids', 'stix'),
'attributes' => array('text', 'downloadAttachment'),
'events' => array('csv', 'nids', 'hids', 'xml', 'restSearch', 'stix'),
'attributes' => array('text', 'downloadAttachment', 'returnAttributes', 'restSearch'),
);
public function __construct($id = false, $table = null, $ds = null) {