From 8ef89e9f968ac1f8946c9bf3dccda687267596db Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Mon, 14 Feb 2022 09:59:40 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=81=93=E5=85=B7?=
 =?UTF-8?q?=E7=82=B9=E5=90=8D=E5=8D=A1=E4=BD=BF=E7=94=A8=E5=90=8E=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=97=A0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/class/magic/magic_call.php | 3 ++-
 upload/source/module/home/home_magic.php | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/upload/source/class/magic/magic_call.php b/upload/source/class/magic/magic_call.php
index 3d97f52e8..e22acc6d1 100644
--- a/upload/source/class/magic/magic_call.php
+++ b/upload/source/class/magic/magic_call.php
@@ -47,11 +47,12 @@ class magic_call {
 				$list[] = $value;
 				$note_inserts[] = array(
 					'uid' => $value['fuid'],
-					'type' => $name,
+					'type' => "magic",
 					'new' => 1,
 					'authorid' => $_G['uid'],
 					'author' => $_G['username'],
 					'note' => $note,
+					'category' => 3,					
 					'dateline' => $_G['timestamp']
 				);
 			}
diff --git a/upload/source/module/home/home_magic.php b/upload/source/module/home/home_magic.php
index f8ff8c071..1afda88a5 100644
--- a/upload/source/module/home/home_magic.php
+++ b/upload/source/module/home/home_magic.php
@@ -450,9 +450,7 @@ if($action == 'shop') {
 			foreach($luids as $log) {
 				$luids[$log['uid']] = $log['uid'];
 			}
-			$members = C::t('common_magiclog')->fetch_all($luids);
 			foreach($logs as $log) {
-				$log['username'] = $members[$log['uid']]['username'];
 				$log['dateline'] = dgmdate($log['dateline'], 'u');
 				$log['name'] = $magicarray[$log['magicid']]['name'];
 				$loglist[] = $log;
-- 
Gitee