diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-03 04:03:39 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-03 04:03:39 +0200 |
| commit | 3c3f203f140848fb84a1e75f2c412ccc567a6cc1 (patch) | |
| tree | aa1a1921981aed421236871a05435d6eaf21d967 /phpBB/includes/acp/acp_captcha.php | |
| parent | f1b057102d9148477a9bbd7928d2749af9c7505e (diff) | |
| parent | 44de24f1b8b32a5ce3391b9ef24518a6671e452d (diff) | |
| download | forums-3c3f203f140848fb84a1e75f2c412ccc567a6cc1.tar forums-3c3f203f140848fb84a1e75f2c412ccc567a6cc1.tar.gz forums-3c3f203f140848fb84a1e75f2c412ccc567a6cc1.tar.bz2 forums-3c3f203f140848fb84a1e75f2c412ccc567a6cc1.tar.xz forums-3c3f203f140848fb84a1e75f2c412ccc567a6cc1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
Diffstat (limited to 'phpBB/includes/acp/acp_captcha.php')
| -rw-r--r-- | phpBB/includes/acp/acp_captcha.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index c7c64ae56b..1a083c20ac 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -124,6 +124,8 @@ class acp_captcha 'CAPTCHA_PREVIEW_TPL' => $demo_captcha->get_demo_template($id), 'S_CAPTCHA_HAS_CONFIG' => $demo_captcha->has_config(), 'CAPTCHA_SELECT' => $captcha_select, + + 'U_ACTION' => $this->u_action, )); } } |