diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-21 09:49:53 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-21 09:49:53 -0500 |
| commit | 3ab222d1c748f26378152606a27accc8de9a45e0 (patch) | |
| tree | 3674775daf950a12a04bfbb494812b07316c5105 /phpBB/includes/avatar/driver/upload.php | |
| parent | fd4043526d9008de30ee82b4ea38efaef01796d0 (diff) | |
| parent | 721bc03b2b992f4df14afcbe64bb2f0cb7d73cf5 (diff) | |
| download | forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar.gz forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar.bz2 forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar.xz forums-3ab222d1c748f26378152606a27accc8de9a45e0.zip | |
Merge remote-tracking branch 'remotes/Senky/ticket/11010' into develop
# By Senky (19) and others
# Via Senky
* remotes/Senky/ticket/11010: (32 commits)
[ticket/11010] properly tabifying 'max_autologin_time'
[ticket/11010] resolving latest comments
[ticket/11010] Fixes for number input in acp
[ticket/11010] Fix input type for urls
[ticket/11010] Fix email inputs
[ticket/11010] updating tests
[ticket/11010] dealing with dimensions problem, removing extra code
[ticket/11010] Change input type to search for search forms
[ticket/11010] Add all HTML5 input types to ACP
[ticket/11010] Add HTML5 input types to installer
[ticket/11010] validation to match type
[ticket/11010] displaying min and max only if they are set
[ticket/11010] fixing tests
[ticket/11010] replacing maxlenght with max
[ticket/11010] applying some of EXreaction notes
[ticket/11010] Try to keep min < max.
[ticket/11010] Mock user in order for the test to run standalone.
[ticket/11010] Progress toward fixing the test suite.
[ticket/11010] adding type="url" to 'site_home_url'
[ticket/11010] fixing inputs types in memberlist_search.html
...
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 2 |
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), ); } |