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

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

This commit is contained in:
Mikael Nordfeldth 2015-11-05 16:07:42 +01:00
parent c950f18546 5c768d7ef7
commit 0e32729e59
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/User_group.php
View File

@ -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(

1
plugins/TwitterBridge/lib/twitterimport.php
View File

@ -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)