aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-03-01 22:26:08 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-03-01 22:26:08 +0100
commit6c49f95b01c812144b16fdea74cc0841f354e810 (patch)
treebe5f902e9cdf42be023df36f48d3ad41a2aa3960 /phpBB/includes
parent79caaa455e1abbb3d7fe7e473e09c07b1b954fd7 (diff)
parent597311ba6bc611e902357f0a3f0864d4402dc880 (diff)
downloadforums-6c49f95b01c812144b16fdea74cc0841f354e810.tar
forums-6c49f95b01c812144b16fdea74cc0841f354e810.tar.gz
forums-6c49f95b01c812144b16fdea74cc0841f354e810.tar.bz2
forums-6c49f95b01c812144b16fdea74cc0841f354e810.tar.xz
forums-6c49f95b01c812144b16fdea74cc0841f354e810.zip
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class: [feature/request-class] Fix the error message when accessing superglobal
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/request/deactivated_super_global.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/request/deactivated_super_global.php b/phpBB/includes/request/deactivated_super_global.php
index d7a5b3145f..123d6ba5f7 100644
--- a/phpBB/includes/request/deactivated_super_global.php
+++ b/phpBB/includes/request/deactivated_super_global.php
@@ -60,7 +60,7 @@ class phpbb_request_deactivated_super_global implements ArrayAccess, Countable,
$file = '';
$line = 0;
- $message = 'Illegal use of $' . $this->name . '. You must use the request class or request_var() to access input data. Found in %s on line %d. This error message was generated';
+ $message = 'Illegal use of $' . $this->name . '. You must use the request class or request_var() to access input data. Found in %s on line %d. This error message was generated by deactivated_super_global.';
$backtrace = debug_backtrace();
if (isset($backtrace[1]))