mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'igorw/ticket/9608' into develop

Browse Source 
* igorw/ticket/9608:
  [ticket/9608] Remove use of references in topic_review
  [ticket/9608] Revert changes to normalizer
  [ticket/9608] Remove blank line
  [ticket/9608] Remove use of references in captcha and other places
This commit is contained in:
Oleg Pudeyev
2011-08-14 19:24:27 -04:00
parent 5305f6a977 749ab6547d
commit 5fa096aca4
12 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/acp/acp_captcha.php
View File

@@ -46,7 +46,7 @@ class acp_captcha
// Delegate
if ($configure)
{
$config_captcha =& phpbb_captcha_factory::get_instance($selected);
$config_captcha = phpbb_captcha_factory::get_instance($selected);
$config_captcha->acp_page($id, $this);
}
else
@@ -78,11 +78,11 @@ class acp_captcha
// sanity check
if (isset($captchas['available'][$selected]))
{
$old_captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$old_captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$old_captcha->uninstall();
set_config('captcha_plugin', $selected);
$new_captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$new_captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$new_captcha->install();
add_log('admin', 'LOG_CONFIG_VISUAL');
@@ -113,7 +113,7 @@ class acp_captcha
$captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option">' . $user->lang[$title] . '</option>';
}
$demo_captcha =& phpbb_captcha_factory::get_instance($selected);
$demo_captcha = phpbb_captcha_factory::get_instance($selected);
foreach ($config_vars as $config_var => $options)
{
@@ -136,7 +136,7 @@ class acp_captcha
{
global $db, $user, $config;
$captcha =& phpbb_captcha_factory::get_instance($selected);
$captcha = phpbb_captcha_factory::get_instance($selected);
$captcha->init(CONFIRM_REG);
$captcha->execute_demo();