From b73187f12c3b700223fbe285044099f8c545c8ea Mon Sep 17 00:00:00 2001
From: joyqi <joyqi@segmentfault.com>
Date: Fri, 22 Sep 2023 11:09:34 +0800
Subject: [PATCH] merge new fixes from master

---
 var/Typecho/Cookie.php |  4 ++--
 var/Widget/Archive.php | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/var/Typecho/Cookie.php b/var/Typecho/Cookie.php
index ad23a612..90664628 100644
--- a/var/Typecho/Cookie.php
+++ b/var/Typecho/Cookie.php
@@ -112,8 +112,8 @@ class Cookie
     public static function setOptions(array $options)
     {
         self::$domain = $options['domain'] ?: self::$domain;
-        self::$secure = $options['secure'] ? (bool) $options['secure'] : false;
-        self::$httponly = $options['httponly'] ? (bool) $options['httponly'] : false;
+        self::$secure = !!$options['secure'];
+        self::$httponly = !!$options['httponly'];
     }
 
     /**
diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php
index 674a1b42..dff096c1 100644
--- a/var/Widget/Archive.php
+++ b/var/Widget/Archive.php
@@ -396,6 +396,29 @@ class Archive extends Contents
         $this->feedUrl = $feedUrl;
     }
 
+    /**
+     * Get the value of feed
+     * Deprecated since 1.3.0
+     *
+     * @deprecated 1.3.0
+     * @return null
+     */
+    public function getFeed()
+    {
+        return null;
+    }
+
+    /**
+     * Set the value of feed
+     * Deprecated since 1.3.0
+     *
+     * @deprecated 1.3.0
+     * @param null $feed
+     */
+    public function setFeed($feed)
+    {
+    }
+
     /**
      * @return Query|null
      */