diff options
| author | Brion Vibber <brion@pobox.com> | 2010-09-28 15:58:11 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-09-28 15:58:11 -0700 |
| commit | 3839627a6f70b04c1c8f44319f44abeb21589ba7 (patch) | |
| tree | 013b87890143e032f0b3f9213276556d7d3dbdfb /lib/activityobject.php | |
| parent | ee6b4c409d9ddc93529a486065998508cda79ecc (diff) | |
| parent | b9177f5e2e3f9697ef1d2863c827d03154ff828e (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/activityobject.php')
| -rw-r--r-- | lib/activityobject.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/activityobject.php b/lib/activityobject.php index 95615d581..52733c47a 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -49,7 +49,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 * @link http://status.net/ */ - class ActivityObject { const ARTICLE = 'http://activitystrea.ms/schema/1.0/article'; @@ -116,7 +115,6 @@ class ActivityObject * * @param DOMElement $element DOM thing to turn into an Activity thing */ - function __construct($element = null) { if (empty($element)) { @@ -216,8 +214,7 @@ class ActivityObject } } - // @fixme rationalize with Activity::_fromRssItem() - + // @todo FIXME: rationalize with Activity::_fromRssItem() private function _fromRssItem($item) { $this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, Activity::RSS); |