diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-01-31 12:39:58 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-21 17:46:37 +0100 |
| commit | 8e737e483e2fbd20712bbcd1b3bb96d623ac0f24 (patch) | |
| tree | d060a17e7c8094e5713cdb2171fea5177c78a057 /phpBB/phpbb/captcha/plugins/qa.php | |
| parent | 4167be1e2c5dc5ea9fcc7ed6b39f54cc68fef5b2 (diff) | |
| download | forums-8e737e483e2fbd20712bbcd1b3bb96d623ac0f24.tar forums-8e737e483e2fbd20712bbcd1b3bb96d623ac0f24.tar.gz forums-8e737e483e2fbd20712bbcd1b3bb96d623ac0f24.tar.bz2 forums-8e737e483e2fbd20712bbcd1b3bb96d623ac0f24.tar.xz forums-8e737e483e2fbd20712bbcd1b3bb96d623ac0f24.zip | |
[ticket/13522] Remove unneeded variables and correctly output input on error
PHPBB3-13522
Diffstat (limited to 'phpBB/phpbb/captcha/plugins/qa.php')
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/qa.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 3a2652d02c..04052b3406 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -691,13 +691,11 @@ class qa { if ($question = $this->acp_get_question_data($question_id)) { - $answers = (isset($question_input['answers'][$lang])) ? $question_input['answers'][$lang] : implode("\n", $question['answers']); - $template->assign_vars(array( 'QUESTION_TEXT' => ($question_input['question_text']) ? $question_input['question_text'] : $question['question_text'], 'LANG_ISO' => ($question_input['lang_iso']) ? $question_input['lang_iso'] : $question['lang_iso'], 'STRICT' => (isset($_REQUEST['strict'])) ? $question_input['strict'] : $question['strict'], - 'ANSWERS' => $answers, + 'ANSWERS' => implode("\n", $question['answers']), )); } else @@ -711,15 +709,13 @@ class qa 'QUESTION_TEXT' => $question_input['question_text'], 'LANG_ISO' => $question_input['lang_iso'], 'STRICT' => $question_input['strict'], - 'ANSWERS' => $question_input['answers'], + 'ANSWERS' => (is_array($question_input['answers'])) ? implode("\n", $question_input['answers']) : '', )); } if ($submit && check_form_key($form_key)) { - $data = $this->acp_get_question_input(); - - if (!$this->validate_input($data)) + if (!$this->validate_input($question_input)) { $template->assign_vars(array( 'S_ERROR' => true, @@ -729,11 +725,11 @@ class qa { if ($question_id) { - $this->acp_update_question($data, $question_id); + $this->acp_update_question($question_input, $question_id); } else { - $this->acp_add_question($data); + $this->acp_add_question($question_input); } add_log('admin', 'LOG_CONFIG_VISUAL'); |