1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +02:00

Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop

# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11201:
  [ticket/11201] Remove database column on update
  [ticket/11201] Remove MSN/WLM fields
This commit is contained in:
Nathan Guse
2013-01-15 18:54:11 -06:00
39 changed files with 21 additions and 267 deletions

View File

@@ -1284,7 +1284,6 @@ CREATE TABLE phpbb_users (
user_icq VARCHAR(15) CHARACTER SET NONE DEFAULT '' NOT NULL,
user_aim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_yim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_msnm VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_jabber VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_website VARCHAR(200) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,