diff options
| author | Zach Copley <zach@status.net> | 2010-03-02 16:51:21 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-02 16:51:21 -0800 |
| commit | 9520c0996d5635ca41b72998321d9587aaf1cc12 (patch) | |
| tree | 6878baec14e0029915ea973b3709af2426f79d5a /lib/activity.php | |
| parent | ca21f1da8603be348c1a34a8bcc3e7610b9a395d (diff) | |
| parent | 79ffebb51b1141791d5ee7478e3a7beaa9fe8faa (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: save file records for enclosures
Changed the geo location cookie Expire to Session.
Diffstat (limited to 'lib/activity.php')
| -rw-r--r-- | lib/activity.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/activity.php b/lib/activity.php index b20153213..ce14fa254 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -1044,6 +1044,7 @@ class Activity public $id; // ID of the activity public $title; // title of the activity public $categories = array(); // list of AtomCategory objects + public $enclosures = array(); // list of enclosure URL references /** * Turns a regular old Atom <entry> into a magical activity @@ -1140,6 +1141,10 @@ class Activity $this->categories[] = new AtomCategory($catEl); } } + + foreach (ActivityUtils::getLinks($entry, 'enclosure') as $link) { + $this->enclosures[] = $link->getAttribute('href'); + } } /** |