Merge branch 'group-join' into 'nightly'

Add User_group::getObjectType

Since 174586bd512, I'm unable to join groups with the logs complaining
about getObjectType not existing on the User_group object.

Note: I'm not sure if this is the correct value to return here, but I
was able to joing groups successfully using this. Let me know if it needs
to be changed and I'll update the Merge Request!

See merge request !56

diff --git a/plugins/Activity/locale/sv/LC_MESSAGES/Activity.po b/plugins/Activity/locale/sv/LC_MESSAGES/Activity.po
index b32f4dbe9d2886e0be27c7154b8312958d5488f1..c37cef4a76868b8e831512ded601b4a3ba9fa703 100644 (file)
--- a/plugins/Activity/locale/sv/LC_MESSAGES/Activity.po
+++ b/plugins/Activity/locale/sv/LC_MESSAGES/Activity.po
@@ -24,7 +24,7 @@ msgstr ""
 #: ActivityPlugin.php:75
 #, php-format
 msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
-msgstr "<a href=\"%1$s\">%2$s</a> började följa <a href=\"%3$s\">%4$s</a."
+msgstr "<a href=\"%1$s\">%2$s</a> började följa <a href=\"%3$s\">%4$s</a>."
 
 #. TRANS: Text for "started following" item in activity plugin.
 #. TRANS: %1$s is a profile name, %2$s is a profile URL,

diff --git a/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php b/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
index 6dd182bc924740b8d266d4b8d30a3ec8b27f49d0..5dd0ee12d7bafb426cb7b9a8a8b277020e2d3c8b 100644 (file)
--- a/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
+++ b/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
@@ -54,6 +54,9 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
         assert($this->isMyActivity($act));
 
         $stored->object_type = ActivityUtils::resolveUri($act->objects[0]->type);
+        if (common_valid_http_url($act->objects[0]->link)) {
+            $stored->url = $act->objects[0]->link;
+        }
 
         // We don't have to do just about anything for a new, remote notice since the fields
         // are handled in the main Notice::saveActivity function. Such as content, attachments,