From b7fa4bd754acf63dcef29e73c05f4f589b00fe9d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 6 Sep 2022 15:30:21 +0800
Subject: [PATCH] * Fix bug #26193.

---
 module/my/control.php               | 5 ++---
 module/my/view/editprofile.html.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index fa751be570..3c9240313d 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1212,9 +1212,8 @@ EOF;
             $_POST['account'] = $this->app->user->account;
             $_POST['groups']  = $this->dao->select('`group`')->from(TABLE_USERGROUP)->where('account')->eq($this->post->account)->fetchPairs('group', 'group');
             $this->user->update($this->app->user->id);
-            if(dao::isError()) helper::end(js::error(dao::getError()));
-            echo js::locate($this->createLink('my', 'profile'), 'parent');
-            return;
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('my', 'profile'), 'closeModal' => true));
         }
 
         $this->app->loadConfig('user');
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index 5d286ef4e6..962686cbbc 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -17,7 +17,7 @@
   <div class='main-header'>
     <h2><i class='icon-pencil'></i> <?php echo $lang->my->editProfile;?></h2>
   </div>
-  <form method='post' target='hiddenwin' id='dataform'>
+  <form method='post' class='form-ajax' id='dataform'>
     <table class='table table-form'>
       <caption><?php echo $lang->my->form->lblBasic;?></caption>
       <tr>