diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-04-16 10:11:09 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-04-16 10:11:09 +0200 |
| commit | 0679a403d538e1c9e1c0c11276755b596a865af8 (patch) | |
| tree | c0fb3d989a23a33d1a35f6ece7abbf4a0691bca4 /phpBB/phpbb/avatar | |
| parent | 7d4be1fe195061fa9ff38d2b83480874843d36bb (diff) | |
| parent | c6fd2f01eb334a8a78bebc1cffd0f071fbe056ea (diff) | |
| download | forums-0679a403d538e1c9e1c0c11276755b596a865af8.tar forums-0679a403d538e1c9e1c0c11276755b596a865af8.tar.gz forums-0679a403d538e1c9e1c0c11276755b596a865af8.tar.bz2 forums-0679a403d538e1c9e1c0c11276755b596a865af8.tar.xz forums-0679a403d538e1c9e1c0c11276755b596a865af8.zip | |
Merge branch 'ticket/8960-olympus' into ticket/8960
Conflicts:
phpBB/includes/acp/acp_board.php
Diffstat (limited to 'phpBB/phpbb/avatar')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 1e50e135e4..f77ef1332b 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -147,7 +147,7 @@ class upload extends \phpbb\avatar\driver\driver return array( 'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int:0', 'type' => 'number:0', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), - '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), ); } |