Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

show PageNotFoundException message #1168

Merged
merged 2 commits into from
Aug 20, 2018
Merged

show PageNotFoundException message #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f41476
~ pass through exception message
puschie286 Aug 20, 2018
8037f3e
~ apply ci style
puschie286 Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/CodeIgniter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ protected function display404errors(PageNotFoundException $e)
}
}

throw PageNotFoundException::forPageNotFound();
throw PageNotFoundException::forPageNotFound($e->getMessage());
}

//--------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions system/Exceptions/PageNotFoundException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ class PageNotFoundException extends \OutOfBoundsException implements ExceptionIn
*/
protected $code = 404;

public static function forPageNotFound()
public static function forPageNotFound($Message)
{
return new static(lang('HTTP.pageNotFound'));
return new static($Message ?? lang('HTTP.pageNotFound'));
}

public static function forEmptyController()
Expand Down