From a1af5562deb0d7335708293122e3db89c21be4be Mon Sep 17 00:00:00 2001
From: Diogo Cordeiro <diogo@fc.up.pt>
Date: Mon, 3 Jun 2019 15:52:36 +0100
Subject: [PATCH] EmailRegistration plugin flow requires a confirmation address
 before user creation

---
 classes/Confirm_address.php | 8 ++++----
 lib/framework.php           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index f8b5b21124..4aaf3a1674 100644
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -3,7 +3,7 @@
  * Table Definition for confirm_address
  */
 
-class Confirm_address extends Managed_DataObject 
+class Confirm_address extends Managed_DataObject
 {
     public $__table = 'confirm_address';                 // table name
     public $code;                            // varchar(32)  primary_key not_null
@@ -11,8 +11,8 @@ class Confirm_address extends Managed_DataObject
     public $address;                         // varchar(191)   not_null   not 255 because utf8mb4 takes more space
     public $address_extra;                   // varchar(191)   not_null   not 255 because utf8mb4 takes more space
     public $address_type;                    // varchar(8)   not_null
-    public $claimed;                         // datetime()  
-    public $sent;                            // datetime()  
+    public $claimed;                         // datetime()
+    public $sent;                            // datetime()
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
@@ -20,7 +20,7 @@ class Confirm_address extends Managed_DataObject
         return array(
             'fields' => array(
                 'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
-                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who requested confirmation'),
+                'user_id' => array('type' => 'int', 'default' => 0, 'description' => 'user who requested confirmation'),
                 'address' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'address (email, xmpp, SMS, etc.)'),
                 'address_extra' => array('type' => 'varchar', 'length' => 191, 'description' => 'carrier ID, for SMS'),
                 'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
diff --git a/lib/framework.php b/lib/framework.php
index 1614e23352..91e5f4ccd2 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,7 +22,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.19.0');
+define('GNUSOCIAL_BASE_VERSION', '1.19.1');
 define('GNUSOCIAL_LIFECYCLE', 'rc0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);