BUGFIX: Return a 404, not a 500, if an invalid action is asked for on…

… a RequestHandler.
silverstripe · Mar 19, 2012 · a2c1858 · a2c1858
1 parent 067204d
commit a2c1858
Showing 1 changed file with 4 additions and 1 deletion.
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()) {