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

Merge branch 'master' into develop

pull/63/head
noud 2012-10-25 15:23:22 +02:00
parent f296a9381e 05085533de
commit f56cb25bed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controller/AppController.php
View File

@ -89,7 +89,7 @@ class AppController extends Controller {
}
}
} else {
$this->Security->blackHoleCallback = 'blackhole';
//$this->Security->blackHoleCallback = 'blackhole'; // TODO needs more investigation
}
// These variables are required for every view
@ -102,9 +102,11 @@ class AppController extends Controller {
$this->set('isAclPublish', $this->checkAcl('publish'));
}
public function blackhole($type) {
// handle errors.
}
//public function blackhole($type) {
// // handle errors.
// throw new Exception(__d('cake_dev', 'The request has been black-holed'));
// //throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
//}
protected function _isRest() {
return (isset($this->RequestHandler) && $this->RequestHandler->isXml());

2
app/View/Attributes/edit.ctp
View File

@ -128,4 +128,4 @@ formCategoryChanged("#AttributeCategory");
$('#AttributeType').val(type_value);
</script>
<?php echo $this->Js->writeBuffer(); // Write cached scripts
<?php echo $this->Js->writeBuffer(); // Write cached scripts