From d9b7d97c47c9de1ba956da524a346f30c5fa0295 Mon Sep 17 00:00:00 2001
From: owen0o0 <32561126+owen0o0@users.noreply.github.com>
Date: Sun, 8 Dec 2019 16:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/nav.css         |  1 +
 inc/fav-content.php | 12 +++++++++---
 single-sites.php    |  7 ++++---
 style.css           |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/css/nav.css b/css/nav.css
index 6c4cb72..c4a0274 100644
--- a/css/nav.css
+++ b/css/nav.css
@@ -198,6 +198,7 @@ footer.main-footer{border-top:0;background-color:#fff}
 .pb-4,.py-4{padding-bottom:3rem!important}
 .pt-4,.py-4{padding-top:3rem!important}
 .border-top{border-top:1px solid rgba(130,130,130,0.1)!important}
+.main-content .tooltip{word-break:break-word}
 /*.ad{overflow:hidden}*/
 .ad img{width:100%;max-height:350px}
 .ad-home img,.ad-footer img{max-height:150px}
diff --git a/inc/fav-content.php b/inc/fav-content.php
index 336cf4c..af2d99b 100644
--- a/inc/fav-content.php
+++ b/inc/fav-content.php
@@ -2,8 +2,14 @@
 function fav_con($mid) { ?>
         <h4 class="text-gray" style="display: inline-block;"><i class="icon-io-tag" style="margin-right: 27px;" id="<?php echo $mid->name; ?>"></i><?php echo $mid->name; ?></h4>
         <?php 
-        $link = esc_url( get_term_link( $mid, 'res_category' ) );
-        echo "<a class='btn-move' href='$link'>more+</a>";
+        $site_n           = io_get_option('site_n');
+        $category_count   = $mid->category_count;
+        $count            = $site_n;
+        if($site_n == 0)  $count = min(get_option('posts_per_page'),$category_count);
+        if($site_n >= 0 && $count < $category_count){
+          $link = esc_url( get_term_link( $mid, 'res_category' ) );
+          echo "<a class='btn-move' href='$link'>more+</a>";
+        }
         ?>
         <div class="row">
         <?php   
@@ -13,7 +19,7 @@ function fav_con($mid) { ?>
           $args = array(
             'post_type'           => 'sites',        //自定义文章类型，这里为sites
             'ignore_sticky_posts' => 1,              //忽略置顶文章
-            'posts_per_page'      => io_get_option('site_n'),             //显示的文章数量
+            'posts_per_page'      => $site_n,        //显示的文章数量
             'meta_key'            => '_sites_order',
             'orderby'             => 'meta_value_num',
             'tax_query'           => array(
diff --git a/single-sites.php b/single-sites.php
index b3f2249..4ff55af 100644
--- a/single-sites.php
+++ b/single-sites.php
@@ -27,11 +27,12 @@
                         <div class="row">
 	    					<div class="col-12 col-sm-4 col-lg-3">
                                 <?php 
-                                $m_link_url = get_post_meta($post->ID, '_sites_link', true); 
-                                if($m_link_url == '')
+                                $m_link_url  = get_post_meta($post->ID, '_sites_link', true); 
+                                $m_thumbnail = get_post_meta(get_the_ID(), '_thumbnail', true);
+                                if($m_thumbnail == '' && $m_link_url == '')
                                     $imgurl = get_template_directory_uri() .'/images/favicon.png';
                                 else
-                                    $imgurl = get_post_meta(get_the_ID(), '_thumbnail', true)? get_post_meta(get_the_ID(), '_thumbnail', true): (io_get_option('ico_url') .format_url($m_link_url) . io_get_option('ico_png'));
+                                    $imgurl = $m_thumbnail? $m_thumbnail : (io_get_option('ico_url') .format_url($m_link_url) . io_get_option('ico_png'));
                                 $sitetitle = get_the_title();
                                 ?>
                                 <div class="siteico">
diff --git a/style.css b/style.css
index 8d0aa75..7e6713c 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 Theme Name:WebStack
 Theme URI:https://www.iowen.cn
 Description:by 一为！官方网站：<a href="https://www.iowen.cn">一为忆</a> 
-Version:1.1208
+Version:1.1208.1
 Author:iowen
 Author URI: https://www.iowen.cn/
 */