diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:16:46 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:16:46 +0200 |
| commit | b8c2bf6ce4be97c0ae100f746afe465a5765dae1 (patch) | |
| tree | 25f6d482b43e4e99485057f0c1e43ef94f1ce175 /phpBB/includes | |
| parent | b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd (diff) | |
| parent | 9f545a7f6ba7ddd54fae083563b5b582e05f5c1c (diff) | |
| download | forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.gz forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.bz2 forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.xz forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.zip | |
Merge remote-tracking branch 'github-asperous/ticket/9975' into develop
* github-asperous/ticket/9975:
[ticket/9975] Moved a few E_USER_ERROR errors to /language
Conflicts:
phpBB/includes/user.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index 83d40bbba7..cb21b04ec5 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -270,7 +270,7 @@ class phpbb_recaptcha extends phpbb_default_captcha $response = ''; if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) { - trigger_error('Could not open socket', E_USER_ERROR); + trigger_error('RECAPTCHA_SOCKET_ERROR', E_USER_ERROR); } fwrite($fs, $http_request); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 05a278a2b4..3a650b37fc 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2733,7 +2733,7 @@ function redirect($url, $return = false, $disable_cd_check = false) // Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2 if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false) { - trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); + trigger_error('INSECURE_REDIRECT', E_USER_ERROR); } // Now, also check the protocol and for a valid url the last time... @@ -2742,7 +2742,7 @@ function redirect($url, $return = false, $disable_cd_check = false) if ($url_parts === false || empty($url_parts['scheme']) || !in_array($url_parts['scheme'], $allowed_protocols)) { - trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); + trigger_error('INSECURE_REDIRECT', E_USER_ERROR); } if ($return) @@ -4184,7 +4184,7 @@ function phpbb_checkdnsrr($host, $type = 'MX') // Handler, header and footer /** -* Error and message handler, call with trigger_error if reqd +* Error and message handler, call with trigger_error if read */ function msg_handler($errno, $msg_text, $errfile, $errline) { |