2 files changed, 19 insertions, 18 deletions
diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json
index 1a9b9b62b7..b71b1fecbe 100644
--- a/phpBB/install/schemas/schema.json
+++ b/phpBB/install/schemas/schema.json
@@ -2088,16 +2088,12 @@
                 "UINT",
                 0
             ],
-            "pf_phpbb_skype": [
-                "VCHAR",
-                ""
-            ],
-            "pf_phpbb_twitter": [
-                "VCHAR",
+            "pf_phpbb_interests": [
+                "MTEXT",
                 ""
             ],
-            "pf_phpbb_youtube": [
-                "VCHAR",
+            "pf_phpbb_occupation": [
+                "MTEXT",
                 ""
             ],
             "pf_phpbb_facebook": [
@@ -2108,19 +2104,19 @@
                 "VCHAR",
                 ""
             ],
-            "pf_phpbb_interests": [
-                "MTEXT",
+            "pf_phpbb_icq": [
+                "VCHAR",
                 ""
             ],
-            "pf_phpbb_occupation": [
-                "MTEXT",
+            "pf_phpbb_location": [
+                "VCHAR",
                 ""
             ],
-            "pf_phpbb_icq": [
+            "pf_phpbb_skype": [
                 "VCHAR",
                 ""
             ],
-            "pf_phpbb_location": [
+            "pf_phpbb_twitter": [
                 "VCHAR",
                 ""
             ],
@@ -2136,6 +2132,10 @@
                 "VCHAR",
                 ""
             ],
+            "pf_phpbb_youtube": [
+                "VCHAR",
+                ""
+            ],
             "pf_phpbb_aol": [
                 "VCHAR",
                 ""
@@ -2711,8 +2711,9 @@
                 0
             ],
             "topic_first_poster_name": [
-                "VCHAR_UNI",
-                ""
+                "VCHAR_UNI:255",
+                "",
+                "true_sort"
             ],
             "topic_first_poster_colour": [
                 "VCHAR:6",
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 9cc151f728..37e1c8de50 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -70,7 +70,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'phpbb_captcha_nogd');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'core.captcha.plugins.nogd');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_foreground_noise', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_x_grid', '25');
@@ -273,7 +273,7 @@ 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_path', 'files');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC3-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC4-dev');
 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');