Merge branch 'master' of github.com:typecho/typecho

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 {

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 {

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');