singlexyz/ChatGPT-Next-Web
1
0
Fork 0
forked from XiaoMo/ChatGPT-Next-Web
Code Pull Requests Activity

Merge pull request #2713 from kfear1337/CodeQL-Report

Browse Source
This commit is contained in:
Yifei Zhang 2023-08-28 00:54:58 +08:00 committed by GitHub
commit 6d8416f838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/sidebar.tsx
View File

@ -174,7 +174,7 @@ export function SideBar(props: { className?: string }) {
</Link> </Link>
</div> </div>
<div className={styles["sidebar-action"]}> <div className={styles["sidebar-action"]}>
<a href={REPO_URL} target="_blank"> <a href={REPO_URL} target="_blank" rel="noopener noreferrer">
<IconButton icon={<GithubIcon />} shadow /> <IconButton icon={<GithubIcon />} shadow />
</a> </a>
</div> </div>

8
app/utils/merge.ts
View File

@ -1,9 +1,13 @@
export function merge(target: any, source: any) { export function merge(target: any, source: any) {
Object.keys(source).forEach(function (key) { Object.keys(source).forEach(function (key) {
if (source[key] && typeof source[key] === "object") { if (
source.hasOwnProperty(key) && // Check if the property is not inherited
source[key] &&
typeof source[key] === "object" || key === "__proto__" || key === "constructor"
) {
merge((target[key] = target[key] || {}), source[key]); merge((target[key] = target[key] || {}), source[key]);
return; return;
} }
target[key] = source[key]; target[key] = source[key];
}); });
} }