diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-03 04:03:22 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-03 04:03:22 +0200 |
| commit | 44de24f1b8b32a5ce3391b9ef24518a6671e452d (patch) | |
| tree | 189fda085d12104a4c72fe05c9a8c706173e2cb9 /phpBB | |
| parent | d4531c9ceafe8f78bce8693b314103916c34ee0a (diff) | |
| parent | 5ef4987ffe15fe1fbafc9d9eae005f29a028dd3e (diff) | |
| download | forums-44de24f1b8b32a5ce3391b9ef24518a6671e452d.tar forums-44de24f1b8b32a5ce3391b9ef24518a6671e452d.tar.gz forums-44de24f1b8b32a5ce3391b9ef24518a6671e452d.tar.bz2 forums-44de24f1b8b32a5ce3391b9ef24518a6671e452d.tar.xz forums-44de24f1b8b32a5ce3391b9ef24518a6671e452d.zip | |
Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympus
* VSEphpbb/ticket/11617:
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
Diffstat (limited to 'phpBB')
| -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 469a367bba..bfec7c27d8 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, )); } } |