diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-26 23:30:06 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-26 23:30:06 +0530 |
| commit | eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4 (patch) | |
| tree | 4bf58be378a0bbfa105d91dbd83f5878c13363ed /phpBB/includes/acp/acp_attachments.php | |
| parent | 9b27d00d5fc8228ec4f9150aa26bcf450dc45524 (diff) | |
| parent | fbbf210747c7925d13d50f76395a75feea2e6ba4 (diff) | |
| download | forums-eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4.tar forums-eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4.tar.gz forums-eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4.tar.bz2 forums-eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4.tar.xz forums-eb3e1b35d68a554dfdf3b5596f8fcdeffd0b81e4.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
[ticket/12196] Fix typo "referer" in acp/attachments
Diffstat (limited to 'phpBB/includes/acp/acp_attachments.php')
| -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 59057a0447..39279e63d6 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_REFERRER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERER', '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, |