aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDhruv Goel <dhruv.goel92@gmail.com>2014-06-09 04:38:01 +0530
committerDhruv Goel <dhruv.goel92@gmail.com>2014-06-09 04:38:01 +0530
commit6c1ff04ca092cde6a4dadd0b137cd6e4613822aa (patch)
treea7bd6a5cec3c6460e503d908be46c06f2360c14d /phpBB
parentb667923bccfc84c4aeb799e16e6abbf0859e481c (diff)
parent9a02dc3e27c955d45a9361b5d49ec860a9c240c9 (diff)
downloadforums-6c1ff04ca092cde6a4dadd0b137cd6e4613822aa.tar
forums-6c1ff04ca092cde6a4dadd0b137cd6e4613822aa.tar.gz
forums-6c1ff04ca092cde6a4dadd0b137cd6e4613822aa.tar.bz2
forums-6c1ff04ca092cde6a4dadd0b137cd6e4613822aa.tar.xz
forums-6c1ff04ca092cde6a4dadd0b137cd6e4613822aa.zip
Merge pull request #2555 from marc1706/ticket/11331
[ticket/11331] Inform user that double dots will be stripped from avatar paths
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/acp/board.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5e4961c435..7dd83e83db 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -111,9 +111,9 @@ $lang = array_merge($lang, array(
'ALLOW_REMOTE_UPLOAD_EXPLAIN' => 'Allow uploading of avatars from another website.',
'ALLOW_UPLOAD' => 'Enable avatar uploading',
'AVATAR_GALLERY_PATH' => 'Avatar gallery path',
- 'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.',
+ 'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.<br />Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
'AVATAR_STORAGE_PATH' => 'Avatar storage path',
- 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.<br />Avatar uploading <strong>will not be available</strong> if this path is not writable.',
+ 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.<br />Avatar uploading <strong>will not be available</strong> if this path is not writable.<br />Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions',
'MAX_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.',
'MAX_FILESIZE' => 'Maximum avatar file size',