Removed avatar context menu from large profile picture

git-svn-id: https://code.elgg.org/elgg/trunk@1974 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 20 insertions, 4 deletions

diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index de9cf370b..49d87a95f 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -38,9 +38,15 @@
 		} else {

 			$align = "";

 		}

-			

-?>

 

+	// Override

+		if (isset($vars['override']) && $vars['override'] == true) {

+			$override = true;

+		} else $override = false;

+		

+		if (!$override) {

+		

+?>

 <div class="usericon">

 <div class="avatar_menu_button"><img src="<?php echo $vars['url']; ?>_graphics/avatar_menu_arrow.gif" width="15" height="15" class="arrow" /></div>

 

@@ -66,11 +72,20 @@
 		?>

 

 	</div>	

-	<a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo htmlentities($vars['entity']->name, null, 'UTF-8'); ?>" <?php echo $vars['js']; ?> /></a>

+	<a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><?php 

+		

+	} 

+	

+	?><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo htmlentities($vars['entity']->name, null, 'UTF-8'); ?>" <?php echo $vars['js']; ?> /><?php

+

+		if (!$override) {

+	

+	?></a>

 </div>

 

 <?php

 

 	}

+		}

 

 ?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php
index dae093bfb..a946e8efb 100644
--- a/mod/profile/views/default/profile/userdetails.php
+++ b/mod/profile/views/default/profile/userdetails.php
@@ -38,7 +38,8 @@
 						"profile/icon", array(
 												'entity' => $vars['entity'],
 												//'align' => "left",
-												'size' => $iconsize,
+												'size' => $iconsize,

+												'override' => true,
 											  )
 					);