Opps, left-overs from merge ...

[quix0rs-gnu-social.git] / classes / User_im_prefs.php

diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 16fd030bb42ce43c35307ef4d8826fb3fa5fd263..6a5fc7f3ab55a70b4df8f8b060d5bba2c3e97c20 100644 (file)
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -40,7 +40,6 @@ class User_im_prefs extends Managed_DataObject
     public $transport;                       // varchar(191)  not_null   not 255 because utf8mb4 takes more space
     public $notify;                          // tinyint(1)
     public $replies;                         // tinyint(1)
-    public $microid;                         // tinyint(1)
     public $updatefrompresence;              // tinyint(1)
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
@@ -57,7 +56,6 @@ class User_im_prefs extends Managed_DataObject
                 'transport' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
                 'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
                 'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
-                'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
                 'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
                 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
                 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),