Merge pull request #91 from youranreus/dev3.0

Dev3.0
youranreus · Nov 13, 2022 · 2278bd5 · 2278bd5
2 parents f921fc3 + 4dbfe30
commit 2278bd5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/components/article.php b/components/article.php
@@ -16,7 +16,7 @@
     <?php while ($this->next()): ?>
         <div class="article-item" style="width: 100%;">
             <h2 class="article-title"><a href="<?php $this->permalink(); ?>"><?php $this->title() ?></a></h2>
-            <p><?php echo G::excerpt($this->excerpt, 50); ?></p>
+            <p><?php $this->excerpt(50); ?></p>
             <div class="article-data">
                 <span><?php $this->category(); ?></span>
                 <span><?php $this->date('Y-m-d'); ?></span>

diff --git a/components/header.php b/components/header.php
@@ -34,9 +34,8 @@
     <?php if($this->options->enableKatex == 1): ?>
         <link rel="stylesheet" href="<?php echo G::staticUrl('static/css/katex.min.css'); ?>">
     <?php endif; ?>
-    <link rel="preload" href="<?php echo G::staticUrl('static/js/spotlight.bundle.js'); ?>" as="script">
     <link rel="stylesheet" href="<?php echo G::staticUrl('static/css/G.css'); ?>?v=<?php echo $devTag; ?>">
-    <link rel="stylesheet" href="<?php echo G::staticUrl("static/css/dark$minInfix.css?v=$devTag"); ?>" title="dark">
+    <link rel="stylesheet alternate" href="<?php echo G::staticUrl("static/css/dark$minInfix.css?v=$devTag"); ?>" title="dark" disabled>
 
     <style>
         /* 设置自定义背景[颜色/图片] */

diff --git a/index.php b/index.php
@@ -4,7 +4,7 @@
  *
  * @package G
  * @author 季悠然
- * @version 3.3.6
+ * @version 3.3.7
  * @link https://季悠然.space
  */
 

diff --git a/libs/G.class.php b/libs/G.class.php
@@ -10,7 +10,7 @@ class G
      *
      * @var string
      */
-    public static $version = "3.3.6";
+    public static $version = "3.3.7";
 
     /**
      * 主题配置
@@ -331,7 +331,7 @@ public static function excerpt($content, $limit)
         $result = mb_substr($content, 0, $limit);
         $result = self::analyzeMeme($result);
         $result = preg_replace('/\[[^\]]*\]/', '', $result);
-        return $result;
+        return strip_tags($result);
     }
 
     /**