Merge branch 'cli-install' into 'master'

Don't write the config file when --skip-config flag is given to the installer.

See merge request gnu/gnu-social!155

diff --git a/lib/activity.php b/lib/activity.php
index 49f7603d80362e7edb932f1a2bf57f8fce579786..a52f29e9ca64e06bdf317f995f4c597acc20559b 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -180,7 +180,7 @@ class Activity
             foreach ($objectEls as $objectEl) {
                 // Special case for embedded activities
                 $objectType = ActivityUtils::childContent($objectEl, self::OBJECTTYPE, self::SPEC);
-                if (!empty($objectType) && $objectType == ActivityObject::ACTIVITY) {
+                if ((!empty($objectType) && $objectType == ActivityObject::ACTIVITY) || $this->verb == ActivityVerb::SHARE) {
                     $this->objects[] = new Activity($objectEl);
                 } else {
                     $this->objects[] = new ActivityObject($objectEl);