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

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

Browse Source 
Conflicts:
	plugins/OStatus/OStatusPlugin.php

master vs. nightly thing
This commit is contained in:
Mikael Nordfeldth
2015-11-05 16:16:02 +01:00
parent 0e32729e59 f345f1d605
commit 7ccd36849e
7 changed files with 281 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Favorite/FavoritePlugin.php
View File

@@ -194,7 +194,7 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin
$actobj = $act->objects[0];
$object = Fave::saveActivityObject($actobj, $stored);
$stored->object_type = ActivityUtils::resolveUri($object->getObjectType(), true);
$stored->object_type = $object->getObjectType();
return $object;
}