Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
This commit is contained in:
commit
0e32729e59
|
@ -33,6 +33,12 @@ class User_group extends Managed_DataObject
|
|||
/* the code above is auto generated do not remove the tag below */
|
||||
###END_AUTOCODE
|
||||
|
||||
public function getObjectType()
|
||||
{
|
||||
return ActivityObject::GROUP;
|
||||
}
|
||||
|
||||
|
||||
public static function schemaDef()
|
||||
{
|
||||
return array(
|
||||
|
|
|
@ -138,6 +138,7 @@ class TwitterImport
|
|||
$notice->profile_id = $profile->id;
|
||||
$notice->uri = $statusUri;
|
||||
$notice->url = $statusUri;
|
||||
$notice->verb = ActivityVerb::POST;
|
||||
$notice->created = strftime(
|
||||
'%Y-%m-%d %H:%M:%S',
|
||||
strtotime($status->created_at)
|
||||
|
|
Loading…
Reference in New Issue
Block a user