5 files changed, 8 insertions, 9 deletions
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 264543b7b8..7fa9194e81 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -291,7 +291,7 @@ CREATE TABLE phpbb_icons (
   icons_url varchar(255),
   icons_width tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
   icons_height tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
-  icons_order tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
+  icons_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
   PRIMARY KEY (icons_id)
 );
@@ -639,7 +639,7 @@ CREATE TABLE phpbb_smilies (
   smiley_url varchar(50),
   smiley_width tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
   smiley_height tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
-  smiley_order tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
+  smiley_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
   PRIMARY KEY (smiley_id)
 );
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 73c8ae8bd7..57fc56048e 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -615,7 +615,7 @@ CREATE TABLE phpbb_icons (
   icons_url varchar2(255),
   icons_width number(4) DEFAULT '0' NOT NULL,
   icons_height number(4) DEFAULT '0' NOT NULL,
-  icons_order number(4) DEFAULT '0' NOT NULL,
+  icons_order number(8) DEFAULT '0' NOT NULL,
   display_on_posting number(1) DEFAULT '1' NOT NULL,
   CONSTRAINT pk_phpbb_icons PRIMARY KEY (icons_id)
 )
@@ -1322,7 +1322,7 @@ CREATE TABLE phpbb_smilies (
   smiley_url varchar2(50),
   smiley_width number(4) DEFAULT '0' NOT NULL,
   smiley_height number(4) DEFAULT '0' NOT NULL,
-  smiley_order number(4) DEFAULT '0' NOT NULL,
+  smiley_order number(8) DEFAULT '0' NOT NULL,
   display_on_posting number(1) DEFAULT '1' NOT NULL,
   CONSTRAINT pk_phpbb_smilies PRIMARY KEY (smiley_id)
 )
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 9134573136..07296bf658 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -485,7 +485,7 @@ CREATE TABLE phpbb_icons (
   icons_url varchar(255),
   icons_width INT2  NOT NULL,
   icons_height INT2  NOT NULL,
-  icons_order INT2  NOT NULL,
+  icons_order INT4  NOT NULL,
   display_on_posting INT2  DEFAULT '1' NOT NULL,
   PRIMARY KEY (icons_id),
   CHECK (icons_width>=0),
@@ -981,7 +981,7 @@ CREATE TABLE phpbb_smilies (
   smiley_url varchar(50),
   smiley_width INT2  NOT NULL,
   smiley_height INT2  NOT NULL,
-  smiley_order INT2  NOT NULL,
+  smiley_order INT4  NOT NULL,
   display_on_posting INT2  DEFAULT '1' NOT NULL,
   PRIMARY KEY (smiley_id),
   CHECK (smiley_width>=0),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index d577160055..8b1bb2ad20 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -65,7 +65,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/')
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_hide_groups', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 5ab3271c31..b4e38def38 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -315,7 +315,7 @@ CREATE TABLE phpbb_icons (
   icons_url varchar(255),
   icons_width tinyint(4) NOT NULL DEFAULT '0',
   icons_height tinyint(4) NOT NULL DEFAULT '0',
-  icons_order tinyint(4) NOT NULL DEFAULT '0',
+  icons_order mediumint(8) NOT NULL DEFAULT '0',
   display_on_posting tinyint(1) NOT NULL DEFAULT '1'
 );
 
@@ -687,7 +687,7 @@ CREATE TABLE phpbb_smilies (
   smiley_url varchar(50),
   smiley_width tinyint(4) NOT NULL DEFAULT '0',
   smiley_height tinyint(4) NOT NULL DEFAULT '0',
-  smiley_order tinyint(4) NOT NULL DEFAULT '0',
+  smiley_order mediumint(8) NOT NULL DEFAULT '0',
   display_on_posting tinyint(1) NOT NULL DEFAULT '1'
 );