aboutsummaryrefslogtreecommitdiff
path: root/views/default/object
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-26 07:07:27 -0400
committerCash Costello <cash.costello@gmail.com>2011-06-26 07:07:27 -0400
commit64dcaa8cdc75669974501eb0627a5d5b348deb29 (patch)
treec2e231d558870ffa2a0bb9c488972f074048509c /views/default/object
parent89a6e2847452ef957d0360e7ed02ae5dc34bf6d8 (diff)
downloadelgg-64dcaa8cdc75669974501eb0627a5d5b348deb29.tar.gz
elgg-64dcaa8cdc75669974501eb0627a5d5b348deb29.tar.bz2
Fixes #3368 combining $vars with parameters for object/elements/summary view
Diffstat (limited to 'views/default/object')
-rw-r--r--views/default/object/default.php1
-rw-r--r--views/default/object/elements/summary.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/views/default/object/default.php b/views/default/object/default.php
index 27bb1890e..a50f19387 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -42,6 +42,7 @@ $params = array(
'subtitle' => $subtitle,
'tags' => $vars['entity']->tags,
);
+$params = $params + $vars;
$body = elgg_view('object/elements/summary', $params);
echo elgg_view_image_block($icon, $body);
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index 9206ada66..10cf0b148 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -3,15 +3,15 @@
* Object summary
*
* Sample output
- * <ul class="elgg-menu elgg-menu-metadata"><li>Public</li><li>Like this</li></ul>
+ * <ul class="elgg-menu elgg-menu-entity"><li>Public</li><li>Like this</li></ul>
* <h3><a href="">Title</a></h3>
* <p class="elgg-subtext">Posted 3 hours ago by George</p>
* <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
- * <div class="elgg-list-content">Excerpt text</div>
+ * <div class="elgg-content">Excerpt text</div>
*
* @uses $vars['entity'] ElggEntity
* @uses $vars['title'] Title link (optional) false = no title, '' = default
- * @uses $vars['metadata'] HTML for entity metadata and actions (optional)
+ * @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['content'] HTML for the entity content (optional)