Fixes #3368 combining $vars with parameters for object/elements/summary view

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 8456829fe74f35cebeff46d8a888dbb435fe9185..ba08180b19f0dd36e24999fdd9b861dfeeb62dc6 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -74,6 +74,7 @@ if ($full) {
                'subtitle' => $subtitle,
                'tags' => $tags,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        $blog_info = elgg_view_image_block($owner_icon, $list_body);
@@ -94,6 +95,7 @@ HTML;
                'tags' => $tags,
                'content' => $excerpt,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        echo elgg_view_image_block($owner_icon, $list_body);

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 38b0a721a8120efa7d9f75f9791fbb03f59d8a93..ca1f5d312a9a96636e512a5e92839fe9becb8426 100644 (file)
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -65,6 +65,7 @@ if ($full && !elgg_in_context('gallery')) {
                'subtitle' => $subtitle,
                'tags' => $tags,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
        $bookmark_info = elgg_view_image_block($owner_icon, $list_body);
 
@@ -118,7 +119,8 @@ HTML;
                'tags' => $tags,
                'content' => $content,
        );
-
+       $params = $params + $vars;
        $body = elgg_view('object/elements/summary', $params);
+       
        echo elgg_view_image_block($owner_icon, $body);
 }
\ No newline at end of file

diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index c6ac2a429139f4302f586a0f65ad47e167436e55..95e190d3586a4e58aa5d1ccd9e68933e5523b476 100644 (file)
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -76,6 +76,7 @@ if ($full && !elgg_in_context('gallery')) {
                'subtitle' => $subtitle,
                'tags' => $tags,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        $file_info = elgg_view_image_block($file_icon, $list_body);
@@ -104,6 +105,7 @@ HTML;
                'tags' => $tags,
                'content' => $excerpt,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        echo elgg_view_image_block($file_icon, $list_body);

diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 2aa377813ea8adb24433c304b0f43caba94db197..fc91f90d02632527e9f966ed1e72fdfb6233da3d 100644 (file)
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -31,6 +31,7 @@ if ($vars['full_view']) {
                'metadata' => $metadata,
                'subtitle' => $group->briefdescription,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('group/elements/summary', $params);
 
        echo elgg_view_image_block($icon, $list_body);

diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 3a4decbe4956299053d91ae9c8bc5bbc27667bef..22589b84d675ade5cd5a980c4801adb385bfde13 100644 (file)
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -67,6 +67,7 @@ if ($full) {
                'subtitle' => $subtitle,
                'tags' => $tags,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        $info = elgg_view_image_block($poster_icon, $list_body);
@@ -90,6 +91,7 @@ HTML;
                'tags' => $tags,
                'content' => $excerpt,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        echo elgg_view_image_block($poster_icon, $list_body);

diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 2ad44e38c809efd9dc44970967f22f4f05a0846a..8ba9fc298a2201bc992c1d6a270d19aae37ddb4c 100644 (file)
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -82,6 +82,7 @@ if ($full) {
                'subtitle' => $subtitle,
                'tags' => $tags,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        $info = elgg_view_image_block($page_icon, $list_body);
@@ -103,6 +104,7 @@ HTML;
                'tags' => $tags,
                'content' => $excerpt,
        );
+       $params = $params + $vars;
        $list_body = elgg_view('object/elements/summary', $params);
 
        echo elgg_view_image_block($page_icon, $list_body);

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 3ae347711720562c00bf771b7f8a60c320986b35..2727df60da7cfe6ae8f13a855940c3d256890812 100644 (file)
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,6 +51,7 @@ $params = array(
        'content' => thewire_filter($post->description),
        'tags' => false,
 );
+$params = $params + $vars;
 $list_body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($owner_icon, $list_body);

diff --git a/views/default/object/default.php b/views/default/object/default.php
index 27bb1890e5c184836fbaac0bdeedbbfa1cf8f06e..a50f193875c370d8b8739f33a8ec3928b71dc535 100644 (file)
--- 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 9206ada6691355cd567923f09a45115f161b75c8..10cf0b1482292461f7f78b9f1dca0c4c5cda87f0 100644 (file)
--- 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)