diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-11 22:16:10 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-11 22:16:10 +0100 |
| commit | c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b (patch) | |
| tree | d1a901b18261466f47a5db5cc1cf9362a9974a1f /phpBB/language/en/acp/board.php | |
| parent | aa6dd6d4ff28f38f9596b7bb3adf19a8a7988b67 (diff) | |
| parent | 8cf086ef9b200f0b59348c0f0d4946f9ebc4adae (diff) | |
| download | forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar.gz forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar.bz2 forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar.xz forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.zip | |
Merge pull request #4159 from marc1706/ticket/14448
[ticket/14448] Use guzzle for remote files uploading
* marc1706/ticket/14448:
[ticket/14448] Correctly pass verify setting if available
[ticket/14448] Let user decide if remote upload certs should be checked
[ticket/14448] Add new vendor files and dirs to clean task
[ticket/14448] Do not try to test remote upload timeout
[ticket/14448] Remove no longer needed guzzle 3.9.3
[ticket/14448] Use GuzzleHttp and try to verify certs
[ticket/14448] Update composer.json and lock file for guzzlehttp
[ticket/14431] Remote avatar uploading
[ticket/14431] Remote avatar uploading
Diffstat (limited to 'phpBB/language/en/acp/board.php')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index ba51595dc3..462d66a04a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -535,6 +535,8 @@ $lang = array_merge($lang, array( 'REFERRER_VALID_EXPLAIN' => 'If enabled, the referrer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.', 'TPL_ALLOW_PHP' => 'Allow php in templates', 'TPL_ALLOW_PHP_EXPLAIN' => 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.', + 'UPLOAD_CERT_VALID' => 'Validate upload certificate', + 'UPLOAD_CERT_VALID_EXPLAIN' => 'If enabled, certificates of remote uploads will be validated. This requires the CA bundle to be defined by the <samp>openssl.cafile</samp> or <samp>curl.cainfo</samp> setting in your php.ini.', )); // Email Settings |