Refs #2669: Merged password change fixes in 7404 to trunk.

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

1 files changed, 21 insertions, 5 deletions

diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index ea7be401d..416e4dcef 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -12,15 +12,31 @@ if ($user) {
 ?>
 <div class="user_settings password">
 <h3><?php echo elgg_echo('user:set:password'); ?></h3>
-<p>
+
+	<?php
+		// only make the admin user enter current password for changing his own password.
+		if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
+	?>
+	<p>
+	<?php echo elgg_echo('user:current_password:label'); ?>:
+	<?php
+		echo elgg_view('input/password', array('internalname' => 'current_password'));
+	?>
+	</p>
+	<?php } ?>
+
+	<p>
 	<?php echo elgg_echo('user:password:label'); ?>:
 	<?php
-		echo elgg_view('input/password',array('internalname' => 'password'));
-	?></p><p>
+		echo elgg_view('input/password', array('internalname' => 'password'));
+	?>
+	</p>
+
+	<p>
 	<?php echo elgg_echo('user:password2:label'); ?>: <?php
-		echo elgg_view('input/password',array('internalname' => 'password2'));
+		echo elgg_view('input/password', array('internalname' => 'password2'));
 	?>
-</p>
+	</p>
 </div>
 <?php
 }
\ No newline at end of file