Merge branch '4.x-dev' into 5.x-dev

3 files changed, 51 insertions, 1 deletions

diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php
index 7da9b0fab0..c64af3ed73 100644
--- a/core/Db/Schema/Mysql.php
+++ b/core/Db/Schema/Mysql.php
@@ -55,6 +55,7 @@ class Mysql implements SchemaInterface
                           idchange_last_viewed INTEGER UNSIGNED NULL,
                           invited_by VARCHAR(100) NULL,
                           invite_token VARCHAR(191) NULL,
+                          invite_link_token VARCHAR(191) NULL,
                           invite_expired_at TIMESTAMP NULL,
                           invite_accept_at TIMESTAMP NULL,
                             PRIMARY KEY(login),
diff --git a/core/Updates/4.12.0-b4.php b/core/Updates/4.12.0-b4.php
new file mode 100644
index 0000000000..bb18559513
--- /dev/null
+++ b/core/Updates/4.12.0-b4.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link    https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updater;
+use Piwik\Updates as PiwikUpdates;
+use Piwik\Updater\Migration;
+use Piwik\Updater\Migration\Factory as MigrationFactory;
+
+/**
+ * Update for version 4.12.0-b4
+ */
+class Updates_4_12_0_b4 extends PiwikUpdates
+{
+    /**
+     * @var MigrationFactory
+     */
+    private $migration;
+
+    public function __construct(MigrationFactory $factory)
+    {
+        $this->migration = $factory;
+    }
+
+    /**
+     * @param Updater $updater
+     *
+     * @return Migration[]
+     */
+    public function getMigrations(Updater $updater)
+    {
+        return [
+            $this->migration->db->addColumns('user', ['invite_link_token' => 'VARCHAR(191) DEFAULT null'])
+        ];
+    }
+
+    public function doUpdate(Updater $updater)
+    {
+        $updater->executeMigrations(__FILE__, $this->getMigrations($updater));
+    }
+}
diff --git a/core/Version.php b/core/Version.php
index ec30d71482..f4d0dec6e8 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -21,7 +21,7 @@ final class Version
      * The current Matomo version.
      * @var string
      */
-    const VERSION = '4.12.0-b3';
+    const VERSION = '4.12.0';
 
     const MAJOR_VERSION = 4;