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/captcha/plugins/phpbb_recaptcha_plugin.php | |
| 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/captcha/plugins/phpbb_recaptcha_plugin.php')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 |
1 files changed, 1 insertions, 1 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); |