From faf35b951aa039c328e5b5ffb653067e06238c2c Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 14 Sep 2011 22:06:06 -0400
Subject: Fixes #3742 not including the hover menu on the personal
 notifications page

---
 views/default/icon/user/default.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'views/default/icon/user')

diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php
index 6f5c6e2da..2970f1858 100644
--- a/views/default/icon/user/default.php
+++ b/views/default/icon/user/default.php
@@ -37,6 +37,10 @@ if (!$icontime) {
 $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);
+	$hover = false;
+}
 
 $spacer_url = elgg_get_site_url() . '_graphics/spacer.gif';
 
-- 
cgit v1.2.3


From 1a44b71e0cd65a009c0fb54ca11825b75528a327 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Wed, 28 Sep 2011 22:25:24 -0700
Subject: Fixes #3879. Removed some instances of deprecated views / functions.

---
 mod/groups/views/default/groups/invitationrequests.php | 2 +-
 mod/groups/views/default/groups/membershiprequests.php | 2 +-
 mod/profile/views/default/profile/owner_block.php      | 2 +-
 views/default/core/avatar/upload.php                   | 2 +-
 views/default/forms/avatar/crop.php                    | 2 +-
 views/default/icon/user/default.php                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'views/default/icon/user')

diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 788788324..9c2df8b9c 100644
--- 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 4d1c78c8c..7f33b83e0 100644
--- 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 5a65a3a26..05cb41a14 100644
--- 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 6887eab5c..11902cf4a 100644
--- 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 dc5e3d77f..9fcae25c4 100644
--- 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 2970f1858..aca03521f 100644
--- 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;
 }
 
-- 
cgit v1.2.3