Fixes #3879. Removed some instances of deprecated views / functions.

diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 788788324df3290a11975b1d744e7a2778c210d4..9c2df8b9ce40b9fcff7a2f9ef00041399eefac8e 100644 (file)
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -10,7 +10,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
        echo '<ul class="elgg-list">';
        foreach ($vars['invitations'] as $group) {
                if ($group instanceof ElggGroup) {
-                       $icon = elgg_view_entity_icon($group, 'tiny', array('override' => 'true'));
+                       $icon = elgg_view_entity_icon($group, 'tiny', array('hover' => 'true'));
 
                        $group_title = elgg_view('output/url', array(
                                'href' => $group->getURL(),

diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 4d1c78c8cb97397663cc6a31fc2e1c0ad720ea72..7f33b83e0f7d12560ba8a5167885dff3aacea6e1 100644 (file)
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -11,7 +11,7 @@ if (!empty($vars['requests']) && is_array($vars['requests'])) {
        echo '<ul class="elgg-list">';
        foreach ($vars['requests'] as $user) {
                if ($user instanceof ElggUser) {
-                       $icon = elgg_view_entity_icon($user, 'tiny', array('override' => 'true'));
+                       $icon = elgg_view_entity_icon($user, 'tiny', array('hover' => 'true'));
 
                        $user_title = elgg_view('output/url', array(
                                'href' => $user->getURL(),

diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index 5a65a3a261ad564045d8411c4f742928ef90e349..05cb41a14d12f9c8fd2808ba09e7d3109ff18aee 100644 (file)
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -11,7 +11,7 @@ if (!$user) {
        return TRUE;
 }
 
-$icon = elgg_view_entity_icon($user, 'large', array('override' => 'true'));
+$icon = elgg_view_entity_icon($user, 'large', array('hover' => 'true'));
 
 // grab the actions and admin menu items from user hover
 $menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());

diff --git a/views/default/core/avatar/upload.php b/views/default/core/avatar/upload.php
index 6887eab5c4ef4105c8e14ad277b7af6c781e0448..11902cf4aa9f6dd564d5c3c6c2b87d5fedd0ba01 100644 (file)
--- a/views/default/core/avatar/upload.php
+++ b/views/default/core/avatar/upload.php
@@ -5,7 +5,7 @@
  * @uses $vars['entity']
  */
 
-$user_avatar = $vars['entity']->getIcon('medium');
+$user_avatar = $vars['entity']->getIconUrl('medium');
 
 $current_label = elgg_echo('avatar:current');
 

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index dc5e3d77fe836eef6cc7cddd77d548d55a5027b2..9fcae25c44f3a4d1f65f40a1e45b49718d8aa0f8 100644 (file)
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -5,7 +5,7 @@
  * @uses $vars['entity']
  */
 
-$master_image = $vars['entity']->getIcon('master');
+$master_image = $vars['entity']->getIconUrl('master');
 
 ?>
 <div class="clearfix">

diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php
index 2970f18585a89e85775616cb5cef8caa42498691..aca03521ff43959723b46f6970ca2808f82eefcf 100644 (file)
--- a/views/default/icon/user/default.php
+++ b/views/default/icon/user/default.php
@@ -38,7 +38,7 @@ $js = elgg_extract('js', $vars, '');
 
 $hover = elgg_extract('hover', $vars, true);
 if (isset($vars['override'])) {
-       elgg_deprecated_notice("Use 'hover' rather than 'override' with user avatars", 1.8);
+       elgg_deprecated_notice("Use 'hover' rather than 'override' with user avatars", 1.8, 5);
        $hover = false;
 }