aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-10 11:21:47 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-10 11:21:47 +0000
commit0b79cec13a58e40ad14201427eedc7a49a6fb7cf (patch)
treef082f3958d100f4f2996a585d64f7596842bb96d /engine
parente3561e5956ef087ae54f9c40df0534f2b4ec9151 (diff)
downloadelgg-0b79cec13a58e40ad14201427eedc7a49a6fb7cf.tar.gz
elgg-0b79cec13a58e40ad14201427eedc7a49a6fb7cf.tar.bz2
changed name of icon block to picture block in media object to avoid conflicts with elgg sprites
git-svn-id: http://code.elgg.org/elgg/trunk@7592 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/views.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index abc1f9221..7c542b289 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -983,15 +983,15 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
*
* This is a shortcut for {@elgg_view layout/objects/media}.
*
- * @param string $icon The icon and other information
- * @param string $body Description content
- * @param string $vars Additional parameters for the view
+ * @param string $picture The icon and other information
+ * @param string $body Description content
+ * @param string $vars Additional parameters for the view
*
* @return string
* @since 1.8.0
*/
-function elgg_view_media($icon, $body, $vars = array()) {
- $vars['icon'] = $icon;
+function elgg_view_media($picture, $body, $vars = array()) {
+ $vars['pict'] = $picture;
$vars['body'] = $body;
return elgg_view('layout/objects/media', $vars);
}