Fixes #3742 not including the hover menu on the personal notifications page

diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 106eadc543e4b59fb187086625f203ef6b2bed87..a7fbec2fd2060285e240fbea4ff8cec76e9e8a5a 100644 (file)
--- 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 6f5c6e2da81e2c9f492f844b04a27aab6b5435c2..2970f18585a89e85775616cb5cef8caa42498691 100644 (file)
--- 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 1a60e0d88f3a0b6f078813db3f2a96d1352a2fdd..ecf468da35b8ba52e042d75cc98c61f131ab9719 100644 (file)
--- 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'