From 8150e1a6a056efdbbffc1fa9d2f396a339085519 Mon Sep 17 00:00:00 2001
From: taoyu <1255803549@qq.com>
Date: Thu, 5 Jan 2017 23:35:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=97=B6=E7=9A=84=E5=88=A4=E6=96=AD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 var/Widget/Archive.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php
index 9feea090..9d9d4f88 100644
--- a/var/Widget/Archive.php
+++ b/var/Widget/Archive.php
@@ -1227,7 +1227,7 @@ class Widget_Archive extends Widget_Abstract_Contents
      */
     public function select()
     {
-        if ($this->_feed) {
+        if ($this->_invokeByFeed) {
             // 对feed输出加入限制条件
             return parent::select()->where('table.contents.allowFeed = ?', 1)
             ->where('table.contents.password IS NULL');

From 6bcae91008cc95a4d6f1a83a45c19d1b07553431 Mon Sep 17 00:00:00 2001
From: Kokororin <i@kotori.love>
Date: Tue, 24 Jan 2017 18:47:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=BA=8F=E5=8F=B7=E6=A0=B7=E5=BC=8F=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css   | 3 ++-
 admin/scss/style.scss | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index 30376205..8cbefe2f 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -60,7 +60,8 @@ a.balloon-button {
   zoom: 1;
   -moz-border-radius: 30px;
   -webkit-border-radius: 30px;
-  border-radius: 30px; }
+  border-radius: 30px;
+  white-space: nowrap; }
 
 /* line 68, ../scss/style.scss */
 a.button:hover, a.balloon-button:hover {
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index 254cee55..bbe9d079 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -63,6 +63,7 @@ a.balloon-button {
   -moz-border-radius: 30px;
   -webkit-border-radius: 30px;
   border-radius: 30px;
+  white-space: nowrap;
 }
 
 a.button:hover, a.balloon-button:hover {