diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-12 01:49:44 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-12 01:49:44 +0100 |
| commit | a3673789402eae83b94860c87747091125701f78 (patch) | |
| tree | c95893f38eb1c52df491e2bab2b986bb51f21883 /phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | |
| parent | 30dacf8e4e313355c4694db2455e453a0ed62a11 (diff) | |
| parent | f11579549d0250733f4a2bd1759adc2db6d587d3 (diff) | |
| download | forums-a3673789402eae83b94860c87747091125701f78.tar forums-a3673789402eae83b94860c87747091125701f78.tar.gz forums-a3673789402eae83b94860c87747091125701f78.tar.bz2 forums-a3673789402eae83b94860c87747091125701f78.tar.xz forums-a3673789402eae83b94860c87747091125701f78.zip | |
Merge branch 'task/naderman/config-class' into develop
* task/naderman/config-class:
[task/config-class] Do not create multiple cache driver instances.
[task/config-class] Add an attribute for the table name in phpbb_config_db.
[task/config-class] Correctly merge cached config with dynamically loaded data.
[task/config-class] Always specify the config table to use.
[task/config-class] Fix db config constructor param order
[task/config-class] Implemented a config class to replace the global array.
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index e9cc1f57d2..add8c3959f 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -152,9 +152,16 @@ class phpbb_captcha_gd extends phpbb_default_captcha global $config; $config_old = $config; + + $config = new phpbb_config(array()); + foreach ($config_old as $key => $value) + { + $config->set($key, $value); + } + foreach ($this->captcha_vars as $captcha_var => $template_var) { - $config[$captcha_var] = request_var($captcha_var, (int) $config[$captcha_var]); + $config->set($captcha_var, request_var($captcha_var, (int) $config[$captcha_var])); } parent::execute_demo(); $config = $config_old; |