diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-06-30 14:23:16 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-06-30 14:23:16 +0000 |
| commit | 7d22229045484897246e70cf7208a13af34c7531 (patch) | |
| tree | 2854956ec8b55555c292d7f602abeaa9014f1782 | |
| parent | 814e3c661ac7f9c750230bceba0a4f1414c361d6 (diff) | |
| download | forums-7d22229045484897246e70cf7208a13af34c7531.tar forums-7d22229045484897246e70cf7208a13af34c7531.tar.gz forums-7d22229045484897246e70cf7208a13af34c7531.tar.bz2 forums-7d22229045484897246e70cf7208a13af34c7531.tar.xz forums-7d22229045484897246e70cf7208a13af34c7531.zip | |
a bit of text
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9709 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/recaptcha.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php index 2a93b3f895..fb64063a90 100644 --- a/phpBB/includes/captcha/plugins/captcha_abstract.php +++ b/phpBB/includes/captcha/plugins/captcha_abstract.php @@ -255,8 +255,8 @@ class phpbb_default_captcha 'code' => (string) $this->code, 'seed' => (int) $this->seed)) . ' WHERE - confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND - session_id = \'' . $db->sql_escape($user->session_id) . '\''; + confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' + AND session_id = \'' . $db->sql_escape($user->session_id) . '\''; $db->sql_query($sql); } @@ -278,8 +278,8 @@ class phpbb_default_captcha 'seed' => (int) $this->seed)) . ' , attempts = attempts + 1 WHERE - confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND - session_id = \'' . $db->sql_escape($user->session_id) . '\''; + confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' + AND session_id = \'' . $db->sql_escape($user->session_id) . '\''; $db->sql_query($sql); } @@ -293,7 +293,7 @@ class phpbb_default_captcha $sql = 'SELECT code, seed, attempts FROM ' . CONFIRM_TABLE . " WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' + AND session_id = '" . $db->sql_escape($user->session_id) . "' AND confirm_type = " . $this->type; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); diff --git a/phpBB/language/en/recaptcha.php b/phpBB/language/en/recaptcha.php index 82766109a2..e0c3db98b7 100644 --- a/phpBB/language/en/recaptcha.php +++ b/phpBB/language/en/recaptcha.php @@ -46,7 +46,7 @@ $lang = array_merge($lang, array( 'RECAPTCHA_PRIVATE' => 'Private reCaptcha key', 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.', - 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field undeneath.', + 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field underneath.', )); |