From 556d6e198ffe6b36095aea77965f4b05b1432915 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sun, 27 Dec 2015 15:01:28 +0100 Subject: [PATCH] Confirm_address field address_extra _can_ be NULL --- classes/Confirm_address.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php index 91a84feb77..97e1a75dab 100644 --- a/classes/Confirm_address.php +++ b/classes/Confirm_address.php @@ -2,13 +2,9 @@ /** * Table Definition for confirm_address */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; class Confirm_address extends Managed_DataObject { - ###START_AUTOCODE - /* the code below is auto generated do not remove the above tag */ - public $__table = 'confirm_address'; // table name public $code; // varchar(32) primary_key not_null public $user_id; // int(4) not_null @@ -19,9 +15,6 @@ class Confirm_address extends Managed_DataObject public $sent; // datetime() public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP - /* the code above is auto generated do not remove the tag below */ - ###END_AUTOCODE - public static function schemaDef() { return array( @@ -29,7 +22,7 @@ class Confirm_address extends Managed_DataObject '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'), 'address' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'address (email, xmpp, SMS, etc.)'), - 'address_extra' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'carrier ID, for SMS'), + '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")'), 'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'), 'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'), -- 2.39.5