diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
| commit | a3a03a721f62bcf1426a475a543b0b1fcd322bcf (patch) | |
| tree | 4e6349bcf673d21e7513381b9acd1f832654fc02 /mod/thewire | |
| parent | 344e47862b1f39eca19e39a000f97f799cc87a12 (diff) | |
| parent | cf85a49c7e74133feaec7d52d8f289d22b59a56c (diff) | |
| download | elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.gz elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.bz2 | |
Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow-3404-river-revamp
Conflicts:
languages/en.php
Diffstat (limited to 'mod/thewire')
| -rw-r--r-- | mod/thewire/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/thewire/views/default/river/object/thewire/create.php | 20 |
2 files changed, 6 insertions, 16 deletions
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php index 9b2b480ae..e2dd5fdac 100644 --- a/mod/thewire/languages/en.php +++ b/mod/thewire/languages/en.php @@ -29,7 +29,7 @@ $english = array( /** * The wire river */ - 'thewire:river:create' => "posted to the wire", + 'river:create:object:thewire' => "%s posted to the wire", /** * Wire widget diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php index d4dac38ee..2e9cfd83b 100644 --- a/mod/thewire/views/default/river/object/thewire/create.php +++ b/mod/thewire/views/default/river/object/thewire/create.php @@ -7,18 +7,8 @@ $object = $vars['item']->getObjectEntity(); $excerpt = strip_tags($object->description); $excerpt = thewire_filter($excerpt); -$params = array( - 'href' => $object->getURL(), - 'text' => $object->title, -); -$link = elgg_view('output/url', $params); - -echo elgg_echo('thewire:river:create'); - -echo " $link"; - -if ($excerpt) { - echo '<div class="elgg-river-content">'; - echo $excerpt; - echo '</div>'; -} +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'message' => $excerpt, + 'summary' => false, +));
\ No newline at end of file |