aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-09-14 22:06:06 -0400
committerCash Costello <cash.costello@gmail.com>2011-09-14 22:06:06 -0400
commitfaf35b951aa039c328e5b5ffb653067e06238c2c (patch)
tree08887c8400bd408dd9bd7f2db2ef40713a144b68
parent710b17aa37dd5c90db695219defdfef7a889f29a (diff)
downloadelgg-faf35b951aa039c328e5b5ffb653067e06238c2c.tar.gz
elgg-faf35b951aa039c328e5b5ffb653067e06238c2c.tar.bz2
Fixes #3742 not including the hover menu on the personal notifications page
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php2
-rw-r--r--views/default/icon/user/default.php4
-rw-r--r--views/default/input/friendspicker.php2
3 files changed, 6 insertions, 2 deletions
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 106eadc54..a7fbec2fd 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -234,7 +234,7 @@ END;
<td class="namefield">
<a href="<?php echo $friend->getURL(); ?>">
<?php
- echo elgg_view_entity_icon($friend, 'tiny', array('override' => true));
+ echo elgg_view_entity_icon($friend, 'tiny', array('hover' => false));
?>
</a>
<p class="namefieldlink">
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';
diff --git a/views/default/input/friendspicker.php b/views/default/input/friendspicker.php
index 1a60e0d88..ecf468da3 100644
--- a/views/default/input/friendspicker.php
+++ b/views/default/input/friendspicker.php
@@ -187,7 +187,7 @@ if (!isset($vars['replacement'])) {
}
//echo "<p>" . $user->name . "</p>";
- $label = elgg_view_entity_icon($friend, 'tiny', array('override' => true));
+ $label = elgg_view_entity_icon($friend, 'tiny', array('hover' => false));
$options[$label] = $friend->getGUID();
if ($vars['highlight'] == 'all'