Bugfix: Username ist lost when non-admin user changes profile prefere…

…nces

A bug in admin/admin_edit.php creates an empty string for a user's username (and saves that to the database) after the username has been unset because the user is not allowed to change his own username.  The fix prevents this from happening.

admin/admin_edit.php

@@ -64,8 +64,8 @@
             $_REQUEST['password2']="";
         }
 
-        if ($continue) {
-            foreach (array('fname','lname','adminname') as $k) $_REQUEST[$k]=trim($_REQUEST[$k]);
+        if ($continue && isset($_REQUEST['adminname'])) {
+            $_REQUEST['adminname']=trim($_REQUEST['adminname']);
             $pars=array(':adminname'=>$_REQUEST['adminname']);
             $query="SELECT admin_id FROM ".table('admin')."
                     WHERE adminname = :adminname";
@@ -84,6 +84,7 @@
             } else unset($_REQUEST['password']);
 
             if (!$admin_id) $admin_id=time();
+            foreach (array('fname','lname') as $k) $_REQUEST[$k]=trim($_REQUEST[$k]);
             $done=orsee_db_save_array($_REQUEST,"admin",$admin_id,"admin_id");
             message(lang('changes_saved'));
             log__admin("admin_edit",$_REQUEST['adminname']);