diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-26 23:23:33 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-26 23:23:33 +0530 |
| commit | fbbf210747c7925d13d50f76395a75feea2e6ba4 (patch) | |
| tree | eb637c2c2830ac410a61b6221dbf4c93f2eb7edc /phpBB | |
| parent | 2596dbc850df86dd0d620e9d90bfd59a2f23a0eb (diff) | |
| parent | 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2 (diff) | |
| download | forums-fbbf210747c7925d13d50f76395a75feea2e6ba4.tar forums-fbbf210747c7925d13d50f76395a75feea2e6ba4.tar.gz forums-fbbf210747c7925d13d50f76395a75feea2e6ba4.tar.bz2 forums-fbbf210747c7925d13d50f76395a75feea2e6ba4.tar.xz forums-fbbf210747c7925d13d50f76395a75feea2e6ba4.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12196' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12196:
[ticket/12196] Fix typo "referer" in acp/attachments
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index fc5f44e14f..b32e401e14 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -118,7 +118,7 @@ class acp_attachments 'max_attachments_pm' => array('lang' => 'MAX_ATTACHMENTS_PM', 'validate' => 'int', 'type' => 'text:3:3', '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), diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 6aeb3c2188..4618e21894 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -153,8 +153,8 @@ $lang = array_merge($lang, array( 'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP’s/hostnames you define.', 'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.', 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.', - 'SECURE_EMPTY_REFERRER' => 'Allow empty referrer', - 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those omitting the referrer?', + 'SECURE_EMPTY_REFERER' => 'Allow empty referer', + 'SECURE_EMPTY_REFERER_EXPLAIN' => 'Secure downloads are based on referers. Do you want to allow downloads for those omitting the referer?', 'SETTINGS_CAT_IMAGES' => 'Image category settings', 'SPECIAL_CATEGORY' => 'Special category', 'SPECIAL_CATEGORY_EXPLAIN' => 'Special categories differ between the way presented within posts.', |