File class no longer depends on MIME

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

diff --git a/classes/User.php b/classes/User.php
index 2929e1d3325ea9f98cb03f4c7c0178a42f303cf6..d0eba7f75b4d8c21b816d8452f1b1a3a6ecd1726 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -55,7 +55,6 @@ class User extends Managed_DataObject
     public $autosubscribe;                   // tinyint(1)
     public $subscribe_policy;                // tinyint(1)
     public $urlshorteningservice;            // varchar(50)   default_ur1.ca
-    public $inboxed;                         // tinyint(1)
     public $private_stream;                  // tinyint(1)   default_0
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -91,7 +90,6 @@ class User extends Managed_DataObject
                 'autosubscribe' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
                 'subscribe_policy' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => '0 = anybody can subscribe; 1 = require approval'),
                 'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
-                'inboxed' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
                 'private_stream' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to limit all notices to followers only'),
 
                 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
@@ -277,10 +275,6 @@ class User extends Managed_DataObject
             $user->email = $email;
         }
 
-        // This flag is ignored but still set to 1
-
-        $user->inboxed = 1;
-
         // Set default-on options here, otherwise they'll be disabled
         // initially for sites using caching, since the initial encache
         // doesn't know about the defaults in the database.