GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE] Fix wrong Profile_list schema and set created in user_im_prefs properly - by XRevan86

Browse Source 
This reverts 496ab8c9, which was a bad correction of user_im_prefs values
This commit is contained in:
Diogo Cordeiro 2019-07-24 22:28:03 +01:00
parent 6c8d2e159e
commit 46be9b76ef
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actions/confirmaddress.php
View File

@ -140,6 +140,7 @@ class ConfirmaddressAction extends ManagedAction
$user_im_prefs->screenname = $confirm->address; $user_im_prefs->screenname = $confirm->address;
$user_im_prefs->transport = $confirm->address_type; $user_im_prefs->transport = $confirm->address_type;
$user_im_prefs->user_id = $cur->id; $user_im_prefs->user_id = $cur->id;
$user_im_prefs->created = common_sql_now();
$result = $user_im_prefs->insert(); $result = $user_im_prefs->insert();
if ($result === false) { if ($result === false) {

4
classes/Profile_list.php
View File

@ -48,8 +48,8 @@ class Profile_list extends Managed_DataObject
'description' => array('type' => 'text', 'description' => 'description of the people tag'), 'description' => array('type' => 'text', 'description' => 'description of the people tag'),
'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'), 'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'),
'created' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'), 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the tag was added'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was modified'), 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was modified'),
'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'), 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'),
'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page to link to'), 'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page to link to'),

4
classes/User_im_prefs.php
View File

@ -57,8 +57,8 @@ class User_im_prefs extends Managed_DataObject
'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'), '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'), 'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to'),
'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'), '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, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'), 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'), 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
), ),
'primary key' => array('user_id', 'transport'), 'primary key' => array('user_id', 'transport'),
'unique keys' => array( 'unique keys' => array(