summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-23 08:21:32 -0700
committerBrion Vibber <brion@pobox.com>2010-03-23 08:21:32 -0700
commita5c78a6f1a7bef591e136ca23f7a133f8905475a (patch)
tree5ab54039ea0ce4982ebf84e0ba05109f0ec467a9 /scripts
parent68a5fba24847991330d1a31b3c3f875c5d02cb6e (diff)
parent5b0b6097e0e47c84c2e47c8a14421a58be1fac19 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'scripts')
-rw-r--r--scripts/importtwitteratom.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php
index 7316f2108..c12e3b91a 100644
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
@@ -102,7 +102,7 @@ function importActivityStream($user, $doc)
for ($i = $entries->length - 1; $i >= 0; $i--) {
$entry = $entries->item($i);
$activity = new Activity($entry, $feed);
- $object = $activity->object;
+ $object = $activity->objects[0];
if (!have_option('q', 'quiet')) {
print $activity->content . "\n";
}