Merge pull request #250 from sminnee/form-head-request-throws-500

Return 404 rather than 500 on bad actions in requesthandler
silverstripe · Mar 22, 2012 · 0ad6fe7 · 0ad6fe7
2 parents 673500c + 1d5065f
commit 0ad6fe7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/control/RequestHandler.php b/control/RequestHandler.php
@@ -162,12 +162,15 @@ function handleRequest(SS_HTTPRequest $request, DataModel $model) {
 						}
 
 						try {
+							if(!$this->hasMethod($action)) {
+								return $this->httpError(404, "Action '$action' isn't available on class " . get_class($this) . ".");
+							}
 							$result = $this->$action($request);
 						} catch(SS_HTTPResponse_Exception $responseException) {
 							$result = $responseException->getResponse();
 						}
 					} else {
-						return $this->httpError(403, "Action '$action' isn't allowed on class $this->class");
+						return $this->httpError(403, "Action '$action' isn't allowed on class " . get_class($this) . ".");
 					}
 
 					if($result instanceof SS_HTTPResponse && $result->isError()) {

diff --git a/forms/Form.php b/forms/Form.php
@@ -189,7 +189,6 @@ public function __construct($controller, $name, FieldList $fields, FieldList $ac
 
 	static $url_handlers = array(
 		'field/$FieldName!' => 'handleField',
-		'$Action!' => 'handleAction',
 		'POST ' => 'httpSubmission',
 		'GET ' => 'httpSubmission',
 		'HEAD ' => 'httpSubmission',