From b989459d87df9cf0c50b010faf6123eea8c5314b Mon Sep 17 00:00:00 2001
From: joyqi <joyqi@segmentfault.com>
Date: Tue, 28 Mar 2023 11:36:01 +0800
Subject: [PATCH] fix #1545 and close #1547

---
 var/Widget/Base/Comments.php | 2 +-
 var/Widget/Feedback.php      | 4 ++--
 var/Widget/Options.php       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/var/Widget/Base/Comments.php b/var/Widget/Base/Comments.php
index 2a4d0fac..f318711b 100644
--- a/var/Widget/Base/Comments.php
+++ b/var/Widget/Base/Comments.php
@@ -268,7 +268,7 @@ class Comments extends Base implements QueryInterface
         $noFollow = (null === $noFollow) ? $this->options->commentsUrlNofollow : $noFollow;
 
         if ($this->url && $autoLink) {
-            echo '<a href="' . $this->url . '"'
+            echo '<a href="' . Common::safeUrl($this->url) . '"'
                 . ($noFollow ? ' rel="external nofollow"' : null) . '>' . $this->author . '</a>';
         } else {
             echo $this->author;
diff --git a/var/Widget/Feedback.php b/var/Widget/Feedback.php
index b8de4c61..cca026df 100644
--- a/var/Widget/Feedback.php
+++ b/var/Widget/Feedback.php
@@ -206,7 +206,7 @@ class Feedback extends Comments implements ActionInterface
             /** Anti-XSS */
             $comment['author'] = $this->request->filter('trim')->author;
             $comment['mail'] = $this->request->filter('trim')->mail;
-            $comment['url'] = $this->request->filter('trim')->url;
+            $comment['url'] = $this->request->filter('trim', 'url')->url;
 
             /** 修正用户提交的url */
             if (!empty($comment['url'])) {
@@ -305,7 +305,7 @@ class Feedback extends Comments implements ActionInterface
         ];
 
         $trackback['author'] = $this->request->filter('trim')->blog_name;
-        $trackback['url'] = $this->request->filter('trim')->url;
+        $trackback['url'] = $this->request->filter('trim', 'url')->url;
         $trackback['text'] = $this->request->excerpt;
 
         //检验格式
diff --git a/var/Widget/Options.php b/var/Widget/Options.php
index acd53a14..5034ea53 100644
--- a/var/Widget/Options.php
+++ b/var/Widget/Options.php
@@ -82,7 +82,7 @@ if (!defined('__TYPECHO_ROOT_DIR__')) {
  * @property bool $commentsRequireModeration
  * @property bool $commentsWhitelist
  * @property bool $commentsRequireMail
- * @property bool $commentsRequireURL
+ * @property bool $commentsRequireUrl
  * @property bool $commentsCheckReferer
  * @property bool $commentsAntiSpam
  * @property bool $commentsAutoClose