diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 20:01:59 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 20:01:59 +0000 |
| commit | b6aaba915151dd07800761a01b67ffffaee1302b (patch) | |
| tree | 53c30035411460270278943f2427405233b34fac /views | |
| parent | ffbd7cd4179a0186dc674c2d24f578660cc75df0 (diff) | |
| download | elgg-b6aaba915151dd07800761a01b67ffffaee1302b.tar.gz elgg-b6aaba915151dd07800761a01b67ffffaee1302b.tar.bz2 | |
merge -r5898:5928 (not excluding riverdashboard, notifications, and messageboard) from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6058 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/friends/river/create.php | 3 | ||||
| -rw-r--r-- | views/rss/entities/entity_list.php | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php index 3b0b7c309..178459304 100644 --- a/views/default/friends/river/create.php +++ b/views/default/friends/river/create.php @@ -1,6 +1,6 @@ <?php /** - * Elgg create river item + * Elgg create new friend river item * * @package Elgg * @author Curverider Ltd <info@elgg.com> @@ -10,7 +10,6 @@ */ $performed_by = get_entity($vars['item']->subject_guid); $performed_on = get_entity($vars['item']->object_guid); -$url = $performed_on->getURL(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $string = sprintf(elgg_echo("friends:river:add"),$url) . " "; diff --git a/views/rss/entities/entity_list.php b/views/rss/entities/entity_list.php new file mode 100644 index 000000000..83b45b00f --- /dev/null +++ b/views/rss/entities/entity_list.php @@ -0,0 +1,10 @@ +<?php + +$entities = $vars['entities']; +$fullview = $vars['fullview']; + +if (is_array($entities) && sizeof($entities) > 0) { + foreach($entities as $entity) { + echo elgg_view_entity($entity, $fullview); + } +}
\ No newline at end of file |