mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
fix unread/new pm columns
git-svn-id: file:///svn/phpbb/trunk@8267 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
3aacfcff2a
commit
7f2d596c08
8 changed files with 24 additions and 14 deletions
|
@ -1804,8 +1804,8 @@ function get_schema_struct()
|
||||||
'user_style' => array('USINT', 0),
|
'user_style' => array('USINT', 0),
|
||||||
'user_rank' => array('UINT', 0),
|
'user_rank' => array('UINT', 0),
|
||||||
'user_colour' => array('VCHAR:6', ''),
|
'user_colour' => array('VCHAR:6', ''),
|
||||||
'user_new_privmsg' => array('TINT:4', 0),
|
'user_new_privmsg' => array('INT:4', 0),
|
||||||
'user_unread_privmsg' => array('TINT:4', 0),
|
'user_unread_privmsg' => array('INT:4', 0),
|
||||||
'user_last_privmsg' => array('TIMESTAMP', 0),
|
'user_last_privmsg' => array('TIMESTAMP', 0),
|
||||||
'user_message_rules' => array('BOOL', 0),
|
'user_message_rules' => array('BOOL', 0),
|
||||||
'user_full_folder' => array('INT:11', -3),
|
'user_full_folder' => array('INT:11', -3),
|
||||||
|
|
|
@ -1276,8 +1276,8 @@ function get_schema_struct()
|
||||||
'user_style' => array('USINT', 0),
|
'user_style' => array('USINT', 0),
|
||||||
'user_rank' => array('UINT', 0),
|
'user_rank' => array('UINT', 0),
|
||||||
'user_colour' => array('VCHAR:6', ''),
|
'user_colour' => array('VCHAR:6', ''),
|
||||||
'user_new_privmsg' => array('TINT:4', 0),
|
'user_new_privmsg' => array('INT:4', 0),
|
||||||
'user_unread_privmsg' => array('TINT:4', 0),
|
'user_unread_privmsg' => array('INT:4', 0),
|
||||||
'user_last_privmsg' => array('TIMESTAMP', 0),
|
'user_last_privmsg' => array('TIMESTAMP', 0),
|
||||||
'user_message_rules' => array('BOOL', 0),
|
'user_message_rules' => array('BOOL', 0),
|
||||||
'user_full_folder' => array('INT:11', -3),
|
'user_full_folder' => array('INT:11', -3),
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$updates_to_version = '3.0.RC8';
|
$updates_to_version = '3.0.RC9-dev';
|
||||||
|
|
||||||
// Return if we "just include it" to find out for which version the database update is responsuble for
|
// Return if we "just include it" to find out for which version the database update is responsuble for
|
||||||
if (defined('IN_PHPBB') && defined('IN_INSTALL'))
|
if (defined('IN_PHPBB') && defined('IN_INSTALL'))
|
||||||
|
@ -463,6 +463,16 @@ $database_update_info = array(
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
// Changes from 3.0.RC8 to the next version
|
||||||
|
'3.0.RC8' => array(
|
||||||
|
// Change the following columns
|
||||||
|
'change_columns' => array(
|
||||||
|
USERS_TABLE => array(
|
||||||
|
'user_new_privmsg' => array('INT:4', 0),
|
||||||
|
'user_unread_privmsg' => array('INT:4', 0),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Determine mapping database type
|
// Determine mapping database type
|
||||||
|
|
|
@ -917,8 +917,8 @@ CREATE TABLE phpbb_users (
|
||||||
user_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
user_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_colour varbinary(6) DEFAULT '' NOT NULL,
|
user_colour varbinary(6) DEFAULT '' NOT NULL,
|
||||||
user_new_privmsg tinyint(4) DEFAULT '0' NOT NULL,
|
user_new_privmsg int(4) DEFAULT '0' NOT NULL,
|
||||||
user_unread_privmsg tinyint(4) DEFAULT '0' NOT NULL,
|
user_unread_privmsg int(4) DEFAULT '0' NOT NULL,
|
||||||
user_last_privmsg int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
user_last_privmsg int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_message_rules tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
user_message_rules tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_full_folder int(11) DEFAULT '-3' NOT NULL,
|
user_full_folder int(11) DEFAULT '-3' NOT NULL,
|
||||||
|
|
|
@ -917,8 +917,8 @@ CREATE TABLE phpbb_users (
|
||||||
user_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
user_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_colour varchar(6) DEFAULT '' NOT NULL,
|
user_colour varchar(6) DEFAULT '' NOT NULL,
|
||||||
user_new_privmsg tinyint(4) DEFAULT '0' NOT NULL,
|
user_new_privmsg int(4) DEFAULT '0' NOT NULL,
|
||||||
user_unread_privmsg tinyint(4) DEFAULT '0' NOT NULL,
|
user_unread_privmsg int(4) DEFAULT '0' NOT NULL,
|
||||||
user_last_privmsg int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
user_last_privmsg int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_message_rules tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
user_message_rules tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
user_full_folder int(11) DEFAULT '-3' NOT NULL,
|
user_full_folder int(11) DEFAULT '-3' NOT NULL,
|
||||||
|
|
|
@ -1180,8 +1180,8 @@ CREATE TABLE phpbb_users (
|
||||||
user_style INT2 DEFAULT '0' NOT NULL CHECK (user_style >= 0),
|
user_style INT2 DEFAULT '0' NOT NULL CHECK (user_style >= 0),
|
||||||
user_rank INT4 DEFAULT '0' NOT NULL CHECK (user_rank >= 0),
|
user_rank INT4 DEFAULT '0' NOT NULL CHECK (user_rank >= 0),
|
||||||
user_colour varchar(6) DEFAULT '' NOT NULL,
|
user_colour varchar(6) DEFAULT '' NOT NULL,
|
||||||
user_new_privmsg INT2 DEFAULT '0' NOT NULL,
|
user_new_privmsg INT4 DEFAULT '0' NOT NULL,
|
||||||
user_unread_privmsg INT2 DEFAULT '0' NOT NULL,
|
user_unread_privmsg INT4 DEFAULT '0' NOT NULL,
|
||||||
user_last_privmsg INT4 DEFAULT '0' NOT NULL CHECK (user_last_privmsg >= 0),
|
user_last_privmsg INT4 DEFAULT '0' NOT NULL CHECK (user_last_privmsg >= 0),
|
||||||
user_message_rules INT2 DEFAULT '0' NOT NULL CHECK (user_message_rules >= 0),
|
user_message_rules INT2 DEFAULT '0' NOT NULL CHECK (user_message_rules >= 0),
|
||||||
user_full_folder INT4 DEFAULT '-3' NOT NULL,
|
user_full_folder INT4 DEFAULT '-3' NOT NULL,
|
||||||
|
|
|
@ -213,7 +213,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC8');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC9-dev');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
||||||
|
|
||||||
|
|
|
@ -887,8 +887,8 @@ CREATE TABLE phpbb_users (
|
||||||
user_style INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
user_style INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||||
user_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
user_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||||
user_colour varchar(6) NOT NULL DEFAULT '',
|
user_colour varchar(6) NOT NULL DEFAULT '',
|
||||||
user_new_privmsg tinyint(4) NOT NULL DEFAULT '0',
|
user_new_privmsg int(4) NOT NULL DEFAULT '0',
|
||||||
user_unread_privmsg tinyint(4) NOT NULL DEFAULT '0',
|
user_unread_privmsg int(4) NOT NULL DEFAULT '0',
|
||||||
user_last_privmsg INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
user_last_privmsg INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||||
user_message_rules INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
user_message_rules INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||||
user_full_folder int(11) NOT NULL DEFAULT '-3',
|
user_full_folder int(11) NOT NULL DEFAULT '-3',
|
||||||
|
|
Loading…
Add table
Reference in a new issue