8 files changed, 31 insertions, 8 deletions
diff --git a/views/default/admin/users/admins.php b/views/default/admin/users/admins.php
new file mode 100644
index 000000000..9b175d437
--- /dev/null
+++ b/views/default/admin/users/admins.php
@@ -0,0 +1,12 @@
+<?php
+$admins = elgg_list_entities(array(), 'elgg_get_admins');
+	
+?>
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('admin:statistics:label:admins'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php echo $admins; ?>
+	</div>
+</div>
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index b996e5636..059e51dd6 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1238,6 +1238,10 @@ a.elgg-widget-collapsed:before {
 	height: 16px;
 	display: inline-block;
 	margin: 0 2px;
+	vertical-align: text-bottom;
+}
+.elgg-module .elgg-head .elgg-icon {
+	vertical-align: baseline;
 }
 .elgg-icon-delete:hover,
 .elgg-icon-delete-alt:hover {
diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index 5cefba512..e8aa0d2ed 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -4,8 +4,9 @@
  *
  * @since 1.8
  */
+
+if (0) { ?><script><?php }
 ?>
-//<script>
 elgg.provide('elgg.admin');
 
 elgg.admin.init = function () {
@@ -47,7 +48,7 @@ elgg.admin.init = function () {
 
 	// admin notices delete ajax
 	$('a.elgg-admin-notice').click(elgg.admin.deleteNotice);
-}
+};
 
 /**
  * Save the plugin order after a move event.
@@ -88,7 +89,7 @@ elgg.admin.editProfileField = function(value, settings) {
 
 	elgg.action('profile/fields/edit', data);
 	return value;
-}
+};
 
 /**
  * Save the plugin profile order after a move event.
@@ -104,7 +105,7 @@ elgg.admin.moveProfileField = function(e, ui) {
 	elgg.action('profile/fields/reorder', {
 		fieldorder: orderStr
 	});
-}
+};
 
 /**
  * Fires the ajax action to delete the admin notice then hides the notice.
@@ -120,6 +121,6 @@ elgg.admin.deleteNotice = function(e) {
 			$container.slideUp('medium');
 		}
 	});
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.admin.init, 1000);
 \ No newline at end of file
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index 6460e93d6..b82d98ce4 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -50,6 +50,7 @@ foreach ($libs as $file) {
 /**
  * Set some values that are cacheable
  */
+if (0) { ?><script><?php }
 ?>
 
 elgg.version = '<?php echo get_version(); ?>';
diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
index f8234f84f..b45c33463 100644
--- a/views/default/js/initialize_elgg.php
+++ b/views/default/js/initialize_elgg.php
@@ -3,6 +3,7 @@
  * Initialize Elgg's js lib with the uncacheable data
  */
 
+if (0) { ?><script><?php }
 ?>
 /**
  * Don't want to cache these -- they could change for every request
diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php
index c45d46098..d2bceaf90 100644
--- a/views/default/js/lightbox.php
+++ b/views/default/js/lightbox.php
@@ -16,6 +16,7 @@
  * @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options);
  */
 
+if (0) { ?><script><?php }
 ?>
 
 /**
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
index 13ec83c04..7a482fe23 100644
--- a/views/default/js/walled_garden.php
+++ b/views/default/js/walled_garden.php
@@ -12,6 +12,7 @@ $cancel_button = elgg_view('input/button', array(
 ));
 $cancel_button = trim($cancel_button);
 
+if (0) { ?><script><?php }
 ?>
 
 elgg.provide('elgg.walled_garden');
@@ -47,10 +48,10 @@ elgg.walled_garden.load = function(view) {
 				$(id).find('input.elgg-button-submit').after('<?php echo $cancel_button; ?>');
 				$('#elgg-walledgarden-login').fadeToggle();
 				$(id).fadeToggle();
-			},
+			}
 		});
 		event.preventDefault();
-    };
+	};
 };
 
 elgg.register_hook_handler('init', 'system', elgg.walled_garden.init);
 \ No newline at end of file
diff --git a/views/default/output/email.php b/views/default/output/email.php
index 00eefad1f..f5a8bc4b8 100644
--- a/views/default/output/email.php
+++ b/views/default/output/email.php
@@ -10,6 +10,8 @@
  *
  */
 
+$encoded_value = htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8');
+
 if (!empty($vars['value'])) {
-	echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false) ."</a>";
+	echo "<a href=\"mailto:$encoded_value\">$encoded_value</a>";
 }
 \ No newline at end of file