diff options
| author | 3Di <three3di@hotmail.it> | 2019-03-23 05:09:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 05:09:17 +0100 |
| commit | 6921565efe4674c51eb08326313cfca3349eedd5 (patch) | |
| tree | dabee12a9a81fe778be6769c5f1abc5be36ab9cf /phpBB/phpbb/captcha/plugins | |
| parent | 6c1664f6d3b85c1b4d620870444c8f4b82b08e57 (diff) | |
| parent | 0d04f53f374db12a1a285992a9c789a836848b3e (diff) | |
| download | forums-6921565efe4674c51eb08326313cfca3349eedd5.tar forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.gz forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.bz2 forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.xz forums-6921565efe4674c51eb08326313cfca3349eedd5.zip | |
Merge branch '3.2.x' into ticket/15948
Diffstat (limited to 'phpBB/phpbb/captcha/plugins')
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/gd.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/gd_wave.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/nogd.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/qa.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/recaptcha.php | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/phpBB/phpbb/captcha/plugins/gd.php b/phpBB/phpbb/captcha/plugins/gd.php index 831e5bcfdf..6d3c9bb3d2 100644 --- a/phpBB/phpbb/captcha/plugins/gd.php +++ b/phpBB/phpbb/captcha/plugins/gd.php @@ -51,7 +51,7 @@ class gd extends captcha_abstract return 'CAPTCHA_GD'; } - function acp_page($id, &$module) + function acp_page($id, $module) { global $user, $template, $phpbb_log, $request; global $config; diff --git a/phpBB/phpbb/captcha/plugins/gd_wave.php b/phpBB/phpbb/captcha/plugins/gd_wave.php index bde46f8815..4ac26ed2b7 100644 --- a/phpBB/phpbb/captcha/plugins/gd_wave.php +++ b/phpBB/phpbb/captcha/plugins/gd_wave.php @@ -33,7 +33,7 @@ class gd_wave extends captcha_abstract return '\\phpbb\\captcha\\gd_wave'; } - function acp_page($id, &$module) + function acp_page($id, $module) { global $user; diff --git a/phpBB/phpbb/captcha/plugins/nogd.php b/phpBB/phpbb/captcha/plugins/nogd.php index 6845e5935c..da67cd2bf4 100644 --- a/phpBB/phpbb/captcha/plugins/nogd.php +++ b/phpBB/phpbb/captcha/plugins/nogd.php @@ -33,7 +33,7 @@ class nogd extends captcha_abstract return '\\phpbb\\captcha\\non_gd'; } - function acp_page($id, &$module) + function acp_page($id, $module) { global $user; diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 7797212ac9..70b3f72cc3 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -107,8 +107,7 @@ class qa $sql = 'SELECT q.question_id, q.lang_iso FROM ' . $this->table_captcha_questions . ' q, ' . $this->table_captcha_answers . ' a - WHERE q.question_id = a.question_id - GROUP BY lang_iso'; + WHERE q.question_id = a.question_id'; $result = $db->sql_query($sql, 7200); while ($row = $db->sql_fetchrow($result)) @@ -638,7 +637,7 @@ class qa /** * API function - The ACP backend, this marks the end of the easy methods */ - function acp_page($id, &$module) + function acp_page($id, $module) { global $config, $request, $phpbb_log, $template, $user; @@ -776,7 +775,7 @@ class qa /** * This handles the list overview */ - function acp_question_list(&$module) + function acp_question_list($module) { global $db, $template; diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php index 152709a9ea..b7c0b5f5e2 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha.php @@ -66,7 +66,7 @@ class recaptcha extends captcha_abstract throw new \Exception('No generator class given.'); } - function acp_page($id, &$module) + function acp_page($id, $module) { global $config, $template, $user, $phpbb_log, $request; |