adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changes in the error dir

Browse source
This commit is contained in:
AD7six 2011-03-12 20:00:27 +01:00
parent d264d0feb5
commit afc5cd4277
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Error/ExceptionRenderer.php
View file

@ -194,7 +194,7 @@ class ExceptionRenderer {
public function error400($error) { public function error400($error) {
$message = $error->getMessage(); $message = $error->getMessage();
if (Configure::read('debug') == 0 && $error instanceof CakeException) { if (Configure::read('debug') == 0 && $error instanceof CakeException) {
$message = __('Not Found'); $message = __d('cake', 'Not Found');
} }
$url = $this->controller->request->here(); $url = $this->controller->request->here();
$this->controller->response->statusCode($error->getCode()); $this->controller->response->statusCode($error->getCode());
@ -216,7 +216,7 @@ class ExceptionRenderer {
$code = ($error->getCode() > 500) ? $error->getCode() : 500; $code = ($error->getCode() > 500) ? $error->getCode() : 500;
$this->controller->response->statusCode($code); $this->controller->response->statusCode($code);
$this->controller->set(array( $this->controller->set(array(
'name' => __('An Internal Error Has Occurred'), 'name' => __d('cake', 'An Internal Error Has Occurred'),
'message' => h($url), 'message' => h($url),
'error' => $error, 'error' => $error,
)); ));

2
lib/Cake/Error/exceptions.php
View file

@ -182,7 +182,7 @@ class CakeException extends RuntimeException {
public function __construct($message, $code = 500) { public function __construct($message, $code = 500) {
if (is_array($message)) { if (is_array($message)) {
$this->_attributes = $message; $this->_attributes = $message;
$message = __($this->_messageTemplate, $message); $message = __d('cake', $this->_messageTemplate, $message);
} }
parent::__construct($message, $code); parent::__construct($message, $code);
} }