diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 13:25:29 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 13:25:29 +0200 |
| commit | fa230b48ec3b9d79687a2e40804afd75ec4915d6 (patch) | |
| tree | 4f378c6967e19c876f18a685d64bdd0a11e7e9f4 | |
| parent | 06e9d8871c17172e0c9d1a531c1cc6995a7cbb07 (diff) | |
| parent | c6fd2f01eb334a8a78bebc1cffd0f071fbe056ea (diff) | |
| download | forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar.gz forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar.bz2 forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar.xz forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus
* github-marc1706/ticket/8960-olympus:
[ticket/8960] Allow changing avatar path if it's not writable
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index ebbf66657e..526d8e05da 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -123,7 +123,7 @@ class acp_board 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int:0', 'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), 'avatar_min' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'avatar_max' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rwpath', 'type' => 'text:20:255', 'explain' => true), + 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true), 'avatar_gallery_path' => array('lang' => 'AVATAR_GALLERY_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true) ) ); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index f9a40c2bc7..e109ea6d3a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -104,7 +104,7 @@ $lang = array_merge($lang, array( '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_STORAGE_PATH' => 'Avatar storage path', - 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.', + '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.', 'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions', 'MAX_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', 'MAX_FILESIZE' => 'Maximum avatar file size', |