Allow the primary admin to edit their own account even when external

authentication is being used.

diff --git a/user/edit.html b/user/edit.html
index 5a60961561946ebb9982304bb2c3cc42f2c2d88a..710274e7c61682937dae1d783f1a43ad7f07ce95 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -12,9 +12,11 @@
 <table cellpadding=9 cellspacing=0 >
 <?php
 if (isadmin()) {
+    $theadmin = get_admin();
+    $adminself = ($theadmin->id == $USER->id);
     echo "<tr valign=top>";
     echo "<td><p>".get_string("username").":</td>";
-    if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+    if ($adminself || $CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
         echo "<td><input type=\"text\" name=\"username\" size=20 value=\"";
         p($user->username);
         echo "\">";
@@ -29,7 +31,7 @@ if (isadmin()) {
     echo "</td>";
     echo "</tr>";
 
-    if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+    if ($adminself || $CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
         echo "<tr valign=top>";
         echo "<td><p>".get_string("newpassword").":</td>";
         echo "<td><input type=\"text\" name=\"newpassword\" size=20 value=\"";