Fixed user settings config key

CHANGELOG-v3.md

@@ -18,6 +18,7 @@
 - Fixed an error where deleted sites would not be removed from category group or section project config settings.
 - Fixed a bug where active records weren’t preparing their attributes correctly when being restored.
 - Fixed an error that could occur when updating multi-site installs to Craft 3.1. ([#3614](https://github.com/craftcms/cms/issues/3614))
+- Fixed a bug where the default user settings were getting saved with the wrong project config key.
 
 ## 3.1.0-beta.7 - 2019-01-09
 

src/config/app.php

@@ -4,7 +4,7 @@
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
     'version' => '3.1.0-beta.7',
-    'schemaVersion' => '3.1.14',
+    'schemaVersion' => '3.1.15',
     'minVersionRequired' => '2.6.2788',
     'basePath' => dirname(__DIR__), // Defines the @app alias
     'runtimePath' => '@storage/runtime', // Defines the @runtime alias

src/migrations/Install.php

@@ -1148,7 +1148,7 @@ private function _generateInitialConfig(): array
                 'schemaVersion' => Craft::$app->schemaVersion,
                 'timeZone' => 'America/Los_Angeles',
             ],
-            'user' => [
+            'users' => [
                 'requireEmailVerification' => true,
                 'allowPublicRegistration' => false,
                 'defaultGroup' => null,

src/migrations/m190112_124737_fix_user_settings.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace craft\migrations;
+
+use Craft;
+use craft\db\Migration;
+
+/**
+ * m190112_124737_fix_user_settings migration.
+ */
+class m190112_124737_fix_user_settings extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp()
+    {
+        // Don't make the same config changes twice
+        $projectConfig = Craft::$app->getProjectConfig();
+        $schemaVersion = $projectConfig->get('system.schemaVersion', true);
+        if (version_compare($schemaVersion, '3.1.15', '>=')) {
+            return;
+        }
+
+        $wrong = $projectConfig->get('user') ?? [];
+        $right = $projectConfig->get('users') ?? [];
+        $projectConfig->set('users', array_merge($wrong, $right));
+        $projectConfig->remove('user');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown()
+    {
+        echo "m190112_124737_fix_user_settings cannot be reverted.\n";
+        return false;
+    }
+}