diff options
| author | Brion Vibber <brion@pobox.com> | 2010-09-30 11:31:29 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-09-30 11:31:29 -0700 |
| commit | 20f2167425fcbdca3281960297a0a006f4efbddf (patch) | |
| tree | 22eae18225dbcef59592b411ffb8bbd5b3e253ed /lib/activityobject.php | |
| parent | 1acc7d66c63e0b9f794791e3a2e2b0f60bc2ebb1 (diff) | |
| parent | 49611af76de5fca165edd79acefa09851706f8cd (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
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 c957933d0..e89c8db4e 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); |