Upgraded to Elgg 1.8.6.

Merge tag '1.8.6' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.6 release

1 files changed, 21 insertions, 33 deletions

diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php
index a80f3df6b..4857034b2 100644
--- a/views/default/core/settings/account/password.php
+++ b/views/default/core/settings/account/password.php
@@ -1,45 +1,33 @@
 <?php
+
 /**
  * Provide a way of setting your password
  *
  * @package Elgg
  * @subpackage Core
  */
-
 $user = elgg_get_page_owner_entity();
 
 if ($user) {
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('user:set:password'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<?php
-			// only make the admin user enter current password for changing his own password.
-			if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
-		?>
-		<p>
-		<?php echo elgg_echo('user:current_password:label'); ?>:
-		<?php
-			echo elgg_view('input/password', array('name' => 'current_password'));
-		?>
-		</p>
-		<?php } ?>
+	$title = elgg_echo('user:set:password');
 
-		<p>
-		<?php echo elgg_echo('user:password:label'); ?>:
-		<?php
-			echo elgg_view('input/password', array('name' => 'password'));
-		?>
-		</p>
+	// only make the admin user enter current password for changing his own password.
+	$admin = '';
+	if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
+		$admin .= elgg_echo('user:current_password:label') . ': ';
+		$admin .= elgg_view('input/password', array('name' => 'current_password'));
+		$admin = "<p>$admin</p>";
+	}
 
-		<p>
-		<?php echo elgg_echo('user:password2:label'); ?>: <?php
-			echo elgg_view('input/password', array('name' => 'password2'));
-		?>
-		</p>
-	</div>
-</div>
-<?php
-}
\ No newline at end of file
+	$password = elgg_echo('user:password:label') . ': ';
+	$password .= elgg_view('input/password', array('name' => 'password'));
+	$password = "<p>$password</p>";
+
+	$password2 = elgg_echo('user:password2:label') . ': ';
+	$password2 .= elgg_view('input/password', array('name' => 'password2'));
+	$password2 = "<p>$password2</p>";
+
+	$content = $admin . $password . $password2;
+
+	echo elgg_view_module('info', $title, $content);
+}