aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar/driver/upload.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-06-03 22:42:49 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-06-03 22:42:49 +0200
commitaf8c4b29009548fd1a28c3210c4734d84e4ebb48 (patch)
tree12a0bec1c9e91484534c7737afc9d06c6ee95b9d /phpBB/includes/avatar/driver/upload.php
parent79823b9cafb41f4f9405c6a5bf7e0c46b0aa751b (diff)
parent74da9e32e5a3eafb942c4a5ab58c642654cf582e (diff)
downloadforums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.gz
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.bz2
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.xz
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
-rw-r--r--phpBB/includes/avatar/driver/upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 19737693fd..baf51f61c1 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -126,7 +126,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_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' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+ '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),
);
}