diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
| commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
| tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /lib/activitycontext.php | |
| parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
| parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'lib/activitycontext.php')
| -rw-r--r-- | lib/activitycontext.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/activitycontext.php b/lib/activitycontext.php index 09a457924..ff3bc9411 100644 --- a/lib/activitycontext.php +++ b/lib/activitycontext.php @@ -54,8 +54,12 @@ class ActivityContext const MENTIONED = 'mentioned'; const CONVERSATION = 'ostatus:conversation'; - function __construct($element) + function __construct($element = null) { + if (empty($element)) { + return; + } + $replyToEl = ActivityUtils::child($element, self::INREPLYTO, self::THR); if (!empty($replyToEl)) { @@ -73,7 +77,6 @@ class ActivityContext $attention = array(); for ($i = 0; $i < $links->length; $i++) { - $link = $links->item($i); $linkRel = $link->getAttribute(ActivityUtils::REL); |