From 223e2e00a446a5525b327ef840926da377b48804 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 20 Sep 2024 13:07:55 +0800
Subject: [PATCH] * [task#128926] Fix bug#55484.

---
 db/update20.6.sql       | 2 --
 module/common/model.php | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/db/update20.6.sql b/db/update20.6.sql
index c20341c35d..b724e87556 100644
--- a/db/update20.6.sql
+++ b/db/update20.6.sql
@@ -36,5 +36,3 @@ ALTER TABLE `zt_dataview` ADD `mode` enum('text', 'builder') not NULL default 'b
 UPDATE `zt_dataview` SET `mode` = 'text';
 ALTER TABLE `zt_chart` ADD `mode` enum('text', 'builder') not NULL default 'builder' AFTER `driver`;
 UPDATE `zt_chart` SET `mode` = 'text';
-
-ALTER TABLE `zt_extension` CHANGE `zentaoCompatible` `zentaoCompatible` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL;
diff --git a/module/common/model.php b/module/common/model.php
index f320ba26e3..d7a6801502 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1769,7 +1769,11 @@ eof;
         $this->loadModel('action')->create('user', $user->id, 'login');
         $this->loadModel('score')->create('user', 'login');
 
-        if($isFreepasswd) header("Location: {$this->config->webRoot}");
+        if($isFreepasswd)
+        {
+            header("Location: {$this->config->webRoot}");
+            helper::end();
+        }
 
         $this->session->set('ENTRY_CODE', $this->get->code);
         $this->session->set('VALID_ENTRY', md5(md5($this->get->code) . helper::getRemoteIp()));