diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-22 16:17:26 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-22 16:17:26 +0100 |
| commit | f9f43141a91ce07916cc327b7fd94afba7bfb7bf (patch) | |
| tree | d1d0e67188b8c02f8beb7bb86e0537ccc578d102 /phpBB/phpbb/controller | |
| parent | 3bbddbb963a80722738c6c6bacc4abcb301e70eb (diff) | |
| parent | 40ab75478ed7427985e4d147eb6573ce8bb351fc (diff) | |
| download | forums-f9f43141a91ce07916cc327b7fd94afba7bfb7bf.tar forums-f9f43141a91ce07916cc327b7fd94afba7bfb7bf.tar.gz forums-f9f43141a91ce07916cc327b7fd94afba7bfb7bf.tar.bz2 forums-f9f43141a91ce07916cc327b7fd94afba7bfb7bf.tar.xz forums-f9f43141a91ce07916cc327b7fd94afba7bfb7bf.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13361] Rename exception to runtime_exception
[ticket/13361] Fix the JsonResponse in the exception listener
[ticket/13361] Add tests
[ticket/13361] Support ajax request (send a json response)
[ticket/13361] Improve the exception listener
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 2bc8e6b9d0..76acfacf40 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -187,6 +187,8 @@ class helper * @param string $message The error message * @param int $code The error code (e.g. 404, 500, 503, etc.) * @return Response A Response instance + * + * @deprecated 3.1.3 (To be removed: 3.3.0) Use exceptions instead. */ public function error($message, $code = 500) { |