diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:33:42 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:33:42 -0600 |
commit | 941b7287b7dd3477d5ebce8d15a83cdde49e9dd7 (patch) | |
tree | c8a8873e9419a25e03f70802cac00742ae4f1fd0 /phpBB/develop/create_schema_files.php | |
parent | 029f096411f620f2066608cd0a1e8711f88da9e1 (diff) | |
parent | 2e2ddd7e85034f747d5dd312803aadfc47ac80e2 (diff) | |
download | forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.gz forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.bz2 forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.xz forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.zip |
Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
[feature/avatars] Update module_auth of ucp module and fix small issues
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[feature/avatars] Use "Main" as category for avatars in root of gallery
[feature/avatars] Remove trailing whitespace from avatar code
[feature/avatars] Pass phpbb_user to prepare and process form functions
[feature/avatars] Document the use of the allowed extensions array
[feature/avatars] Use array for allowed extensions and implode if needed
[feature/avatars] Use deprecated for compatibility function
[feature/avatars] Correct license, copyright and package info
[feature/avatars] Move list of supported formats to avatar driver class
[feature/avatars] Add include of functions_display.php in BC function
[feature/avatars] Add note about when compatibility function was added
[feature/avatars] Add compatibility function for get_user_avatar()
[feature/avatars] Move definition of driver_collection to avatars.yml
[feature/avatars] Remove the obsolete request argument for avatar drivers
[feature/avatars] Add missing @var to docblocks in avatar manager
[feature/avatars] Remove not needed inline style
[feature/avatars] Differentiate tests for get drivers functions
...
Diffstat (limited to 'phpBB/develop/create_schema_files.php')
-rw-r--r-- | phpBB/develop/create_schema_files.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index a144c5921f..a9caee2e25 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1168,7 +1168,7 @@ function get_schema_struct() 'group_desc_uid' => array('VCHAR:8', ''), 'group_display' => array('BOOL', 0), 'group_avatar' => array('VCHAR', ''), - 'group_avatar_type' => array('TINT:2', 0), + 'group_avatar_type' => array('VCHAR:255', ''), 'group_avatar_width' => array('USINT', 0), 'group_avatar_height' => array('USINT', 0), 'group_rank' => array('UINT', 0), @@ -1885,7 +1885,7 @@ function get_schema_struct() 'user_allow_massemail' => array('BOOL', 1), 'user_options' => array('UINT:11', 230271), 'user_avatar' => array('VCHAR', ''), - 'user_avatar_type' => array('TINT:2', 0), + 'user_avatar_type' => array('VCHAR:255', ''), 'user_avatar_width' => array('USINT', 0), 'user_avatar_height' => array('USINT', 0), 'user_sig' => array('MTEXT_UNI', ''), |