diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:32:27 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:32:27 -0400 |
| commit | 9edc8c6004d1236a21e03fb1c820a6e749f1ee3b (patch) | |
| tree | 3defb2dc56e726c314b4d92d43744faf4d52bd48 /mod/file | |
| parent | 344e47862b1f39eca19e39a000f97f799cc87a12 (diff) | |
| parent | 5e02fd697fd15ae857aa0c2969fd9ea92043a55a (diff) | |
| download | elgg-9edc8c6004d1236a21e03fb1c820a6e749f1ee3b.tar.gz elgg-9edc8c6004d1236a21e03fb1c820a6e749f1ee3b.tar.bz2 | |
Merge pull request #35 - Fixes #3404, #3490
Diffstat (limited to 'mod/file')
| -rw-r--r-- | mod/file/languages/en.php | 4 | ||||
| -rw-r--r-- | mod/file/views/default/river/object/file/create.php | 30 |
2 files changed, 6 insertions, 28 deletions
diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php index 7ced3f112..1db32afcb 100644 --- a/mod/file/languages/en.php +++ b/mod/file/languages/en.php @@ -73,8 +73,8 @@ $english = array( 'file:display:number' => "Number of files to display", - 'file:river:create' => 'uploaded the file', - 'river:commented:object:file' => 'the file', + 'river:create:object:file' => '%s uploaded the file %s', + 'river:comment:object:file' => '%s commented on the file %s', 'item:object:file' => 'Files', diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php index 620d1d18c..dad629120 100644 --- a/mod/file/views/default/river/object/file/create.php +++ b/mod/file/views/default/river/object/file/create.php @@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity(); $excerpt = strip_tags($object->description); $excerpt = elgg_get_excerpt($excerpt); -$params = array( - 'href' => $object->getURL(), - 'text' => $object->title, -); -$link = elgg_view('output/url', $params); - -$group_string = ''; -$container = $object->getContainerEntity(); -if ($container instanceof ElggGroup) { - $params = array( - 'href' => $container->getURL(), - 'text' => $container->name, - ); - $group_link = elgg_view('output/url', $params); - $group_string = elgg_echo('river:ingroup', array($group_link)); -} - -echo elgg_echo('file:river:create'); - -echo " $link $group_string"; - -if ($excerpt) { - echo '<div class="elgg-river-content">'; - echo $excerpt; - echo '</div>'; -} +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'message' => $excerpt, +));
\ No newline at end of file |