1 files changed, 17 insertions, 21 deletions
diff --git a/views/default/output/email.php b/views/default/output/email.php
index e6b406507..f5a8bc4b8 100644
--- a/views/default/output/email.php
+++ b/views/default/output/email.php
@@ -1,21 +1,17 @@
-<?php
-
-	/**
-	 * Elgg email output
-	 * Displays an email address that was entered using an email input field
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['value'] The email address to display
-	 * 
-	 */
-
-    if (!empty($vars['value'])) {
-    	echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlentities($vars['value'], null, 'UTF-8') ."</a>";
-    }
-?>
-\ No newline at end of file
+<?php
+/**
+ * Elgg email output
+ * Displays an email address that was entered using an email input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] The email address to display
+ *
+ */
+
+$encoded_value = htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8');
+
+if (!empty($vars['value'])) {
+	echo "<a href=\"mailto:$encoded_value\">$encoded_value</a>";
+}
+\ No newline at end of file