diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-05 15:44:17 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-05 15:44:17 +0000 |
commit | a633716544ed7c6a2ec47b15dec6bd88c252ab31 (patch) | |
tree | 9addf46e4259265832645c51330e1c347125bbc6 | |
parent | 6b1a4978fdc8e5ce4b7722d9e816fc7f95700497 (diff) | |
download | elgg-a633716544ed7c6a2ec47b15dec6bd88c252ab31.tar.gz elgg-a633716544ed7c6a2ec47b15dec6bd88c252ab31.tar.bz2 |
fixed bug in comment river view due to missing }
git-svn-id: http://code.elgg.org/elgg/trunk@3726 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r-- | languages/en.php | 1 | ||||
-rw-r--r-- | views/default/annotation/annotate.php | 20 |
2 files changed, 13 insertions, 8 deletions
diff --git a/languages/en.php b/languages/en.php index 8a63d6429..8e9171d53 100644 --- a/languages/en.php +++ b/languages/en.php @@ -562,6 +562,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'comments' => 'Comments', 'import' => 'Import', 'export' => 'Export', + 'untitled' => 'Untitled', 'up' => 'Up', 'down' => 'Down', diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php index b4e68c9b2..0348a0ce8 100644 --- a/views/default/annotation/annotate.php +++ b/views/default/annotation/annotate.php @@ -1,6 +1,6 @@ <?php /** - * Elgg AJAX loader + * Elgg comment river view * * @package Elgg * @subpackage Core @@ -8,29 +8,33 @@ * @link http://elgg.org/ */ -$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); +$performed_by = get_entity($vars['item']->subject_guid); $object = get_entity($vars['item']->object_guid); $url = $object->getURL(); $title = $object->title; -if(!$title) { - $title = 'Untitled'; +if (!$title) { + $title = elgg_echo('untitled'); } $subtype = get_subtype_from_id($object->subtype); + //grab the annotation, if one exists -if($vars['item']->annotation_id != 0) { +if ($vars['item']->annotation_id != 0) { $comment = get_annotation($vars['item']->annotation_id)->value; } $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $string = sprintf(elgg_echo("river:posted:generic"),$url) . " "; $string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>"; $string .= "<div class=\"river_content_display\">"; -if($comment){ + +if ($comment) { $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river - if(strlen($contents) > 200) { - $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "..."; + if (strlen($contents) > 200) { + $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "..."; } else { $string .= $contents; } +} + $string .= "</div>"; echo $string;
\ No newline at end of file |