aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-19 17:38:51 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-19 17:38:51 +0000
commit4457f3339d16619b14dc308757a1a826df491e95 (patch)
tree084ef6ac9390574608f96675d6ea8605691f5e5d /mod
parent1f1cb260b0cde61056d7da32bc058969aeca5916 (diff)
downloadelgg-4457f3339d16619b14dc308757a1a826df491e95.tar.gz
elgg-4457f3339d16619b14dc308757a1a826df491e95.tar.bz2
changed name from media block to image block
git-svn-id: http://code.elgg.org/elgg/trunk@7682 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/blog/views/default/object/blog.php4
-rw-r--r--mod/riverdashboard/start.php24
2 files changed, 3 insertions, 25 deletions
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 08e174063..776408cc5 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -92,7 +92,7 @@ if ($full) {
</div>
HTML;
- $blog_info = elgg_view_media($owner_icon, $info);
+ $blog_info = elgg_view_image_block($owner_icon, $info);
echo <<<HTML
$header
@@ -120,5 +120,5 @@ HTML;
</div>
HTML;
- echo elgg_view_media($owner_icon, $body);
+ echo elgg_view_image_block($owner_icon, $body);
}
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index 6d1581873..7955b494e 100644
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -364,27 +364,5 @@ function riverdashboard_view_river_item($item) {
'class' => 'elgg-river-item',
'id' => "river-entity-{$object->guid}",
);
- return elgg_view('layout/objects/media', $vars);
-/*
- if (isset($item->view)) {
- $object = get_entity($item->object_guid);
- $subject = get_entity($item->subject_guid);
- if (!$object || !$subject) {
- // probably means an entity is disabled
- return false;
- } else {
- if (elgg_view_exists($item->view)) {
- $body = elgg_view($item->view, array(
- 'item' => $item
- ));
- }
- }
- return elgg_view('river/item/wrapper', array(
- 'item' => $item,
- 'body' => $body
- ));
- }
- return false;
- *
- */
+ return elgg_view('layout/objects/image_block', $vars);
}