From e75c195c68c4fc7170db95fe24504119ec1c25c5 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Thu, 17 Nov 2022 22:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/inc/inc_archives_functions.php    | 3 ++-
 src/system/libraries/dedehttpdown.class.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php
index bb833914..bb319a67 100644
--- a/src/admin/inc/inc_archives_functions.php
+++ b/src/admin/inc/inc_archives_functions.php
@@ -120,7 +120,8 @@ function GetCurContent($body)
         if (!preg_match("#^(http|https):\/\/#i", $value)) {
             continue;
         }
-        $htd->OpenUrl($value);
+        $v = str_replace('&amp;','&',$value);
+        $htd->OpenUrl($v);
         $itype = $htd->GetHead("content-type");
         $isImage = true;
         if ($itype == 'image/gif') {
diff --git a/src/system/libraries/dedehttpdown.class.php b/src/system/libraries/dedehttpdown.class.php
index 6f607919..1e7b7668 100755
--- a/src/system/libraries/dedehttpdown.class.php
+++ b/src/system/libraries/dedehttpdown.class.php
@@ -324,7 +324,7 @@ class DedeHttpDown
         }
         if (function_exists('curl_init') && function_exists('curl_exec')) {
             $this->m_ch = curl_init();
-            curl_setopt($this->m_ch, CURLOPT_URL, $this->m_scheme.'://'.$this->m_host.':'.$this->m_port.$this->m_path.'?'.$this->m_query);
+            curl_setopt($this->m_ch, CURLOPT_URL, $this->m_url);
             curl_setopt($this->m_ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($this->m_ch, CURLOPT_FOLLOWLOCATION, 1);
             if ($requestType == "POST") {