mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 11:13:59 +02:00
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 ...
This commit is contained in:
@@ -553,7 +553,7 @@ CREATE TABLE [phpbb_groups] (
|
||||
[group_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
|
||||
[group_display] [int] DEFAULT (0) NOT NULL ,
|
||||
[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[group_avatar_type] [int] DEFAULT (0) NOT NULL ,
|
||||
[group_avatar_type] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[group_avatar_width] [int] DEFAULT (0) NOT NULL ,
|
||||
[group_avatar_height] [int] DEFAULT (0) NOT NULL ,
|
||||
[group_rank] [int] DEFAULT (0) NOT NULL ,
|
||||
@@ -1659,7 +1659,7 @@ CREATE TABLE [phpbb_users] (
|
||||
[user_allow_massemail] [int] DEFAULT (1) NOT NULL ,
|
||||
[user_options] [int] DEFAULT (230271) NOT NULL ,
|
||||
[user_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[user_avatar_type] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_avatar_type] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[user_avatar_width] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_avatar_height] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_sig] [text] DEFAULT ('') NOT NULL ,
|
||||
|
Reference in New Issue
Block a user