diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-26 23:33:47 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-26 23:33:47 +0200 |
| commit | ffa1f9baf559468ecb06a7ae88b73f5a7232b53f (patch) | |
| tree | e2c97576903b834d04178c6d15db419bbd3497c2 /phpBB/includes | |
| parent | eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4 (diff) | |
| parent | 66efb1889d44f069eff711377710d804b338b0fb (diff) | |
| download | forums-ffa1f9baf559468ecb06a7ae88b73f5a7232b53f.tar forums-ffa1f9baf559468ecb06a7ae88b73f5a7232b53f.tar.gz forums-ffa1f9baf559468ecb06a7ae88b73f5a7232b53f.tar.bz2 forums-ffa1f9baf559468ecb06a7ae88b73f5a7232b53f.tar.xz forums-ffa1f9baf559468ecb06a7ae88b73f5a7232b53f.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12196] Revert Fix typo "referer" in acp/attachments
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 39279e63d6..59057a0447 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -145,7 +145,7 @@ class acp_attachments 'max_attachments_pm' => array('lang' => 'MAX_ATTACHMENTS_PM', 'validate' => 'int:0:999', 'type' => 'number:0:999', 'explain' => false), 'secure_downloads' => array('lang' => 'SECURE_DOWNLOADS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'secure_allow_deny' => array('lang' => 'SECURE_ALLOW_DENY', 'validate' => 'int', 'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true), - 'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'check_attachment_content' => array('lang' => 'CHECK_CONTENT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'legend2' => $l_legend_cat_images, |