Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: classes/statusnet.ini
This commit is contained in:
@@ -48,16 +48,7 @@ class UserFlagPlugin extends Plugin
|
||||
$schema = Schema::get();
|
||||
|
||||
// For storing user-submitted flags on profiles
|
||||
|
||||
$schema->ensureTable('user_flag_profile',
|
||||
array(new ColumnDef('profile_id', 'integer', null,
|
||||
false, 'PRI'),
|
||||
new ColumnDef('user_id', 'integer', null,
|
||||
false, 'PRI'),
|
||||
new ColumnDef('created', 'datetime', null,
|
||||
false, 'MUL'),
|
||||
new ColumnDef('cleared', 'datetime', null,
|
||||
true, 'MUL')));
|
||||
$schema->ensureDataObject('User_flag_profile');
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user