2 files changed, 9 insertions, 15 deletions
diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php
index 4a2991442..b4634fe7e 100644
--- a/views/default/object/elements/full.php
+++ b/views/default/object/elements/full.php
@@ -2,8 +2,7 @@
 /**
  * Object full rendering
  *
- * Sample output
- * <h2>Title</h3>
+ * Sample output:
  * <div class="elgg-content">
  *     <div class="elgg-image-block">
  *     </div>
@@ -12,32 +11,25 @@
  * </div>
  *
  * @uses $vars['entity']   ElggEntity
- * @uses $vars['title']    Title (false for no title)
  * @uses $vars['icon']     HTML for the content icon
  * @uses $vars['summary']  HTML for the content summary
  * @uses $vars['body']     HTML for the content body
  * @uses $vars['class']    Optional additional class for the content wrapper
  */
 
-$title = elgg_extract('title', $vars);
 $icon = elgg_extract('icon', $vars);
 $summary = elgg_extract('summary', $vars);
 $body = elgg_extract('body', $vars);
 $class = elgg_extract('class', $vars);
 if ($class) {
-	$class = "elgg-content $class";
+	$class = "elgg-content clearfix $class";
 } else {
-	$class = "elgg-content";
-}
-
-if ($title) {
-	$title = elgg_view_title($title);
+	$class = "elgg-content clearfix";
 }
 
 $header = elgg_view_image_block($icon, $summary);
 
 echo <<<HTML
-$title
 <div class="$class">
 $header
 $body
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index 8d82bc52a..63ab8f816 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -13,7 +13,7 @@
  * @uses $vars['title']     Title link (optional) false = no title, '' = default
  * @uses $vars['metadata']  HTML for entity menu and metadata (optional)
  * @uses $vars['subtitle']  HTML for the subtitle (optional)
- * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['tags']      HTML for the tags (default is tags on entity, pass false for no tags)
  * @uses $vars['content']   HTML for the entity content (optional)
  */
 
@@ -27,7 +27,7 @@ if ($title_link === '') {
 		$text = $entity->name;
 	}
 	$params = array(
-		'text' => $text,
+		'text' => elgg_get_excerpt($text, 100),
 		'href' => $entity->getURL(),
 		'is_trusted' => true,
 	);
@@ -39,14 +39,16 @@ $subtitle = elgg_extract('subtitle', $vars, '');
 $content = elgg_extract('content', $vars, '');
 
 $tags = elgg_extract('tags', $vars, '');
-if ($tags !== false) {
+if ($tags === '') {
 	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
 }
 
 if ($metadata) {
 	echo $metadata;
 }
-echo "<h3>$title_link</h3>";
+if ($title_link) {
+	echo "<h3>$title_link</h3>";
+}
 echo "<div class=\"elgg-subtext\">$subtitle</div>";
 echo $tags;