From acb3f7e9e5d8ca9ff999cc214404eac7aaf72a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AA=E5=AD=90?= <jkjoy@live.cn>
Date: Fri, 26 Jul 2024 15:57:19 +0800
Subject: [PATCH] 0.5.8

---
 functions.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/functions.php b/functions.php
index 19e9d99..19f1b22 100644
--- a/functions.php
+++ b/functions.php
@@ -564,14 +564,15 @@ function get_article_info($atts) {
     return $output;
 }
 
+// 创建一个新的类来处理内容过滤
+class ContentFilter
+{
+    public static function filterContent($content, $widget, $lastResult)
+    {
+        // 首先运行之前的过滤器结果
+        $content = empty($lastResult) ? $content : $lastResult;
 
-// 注册短代码
-function register_shortcodes() {
-    Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx = array('ContentProcessor', 'process');
-}
-
-class ContentProcessor {
-    public static function process($content, $widget, $lastResult) {
+        // 然后处理我们的文章短代码
         $content = preg_replace_callback('/\[article\s+([^\]]+)\]/', function($matches) {
             $atts = self::parse_atts($matches[1]);
             return get_article_info($atts);
@@ -603,9 +604,10 @@ class ContentProcessor {
     }
 }
 
-register_shortcodes();
- 
-//在编辑器中添加插入文章引用的按钮
+// 注册钩子
+Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx = array('ContentFilter', 'filterContent');
+
+// 编辑器按钮类
 class EditorButton {
     public static function render()
     {
@@ -639,6 +641,6 @@ EOF;
     }
 }
 
-// 注册钩子
+// 注册编辑器按钮钩子
 Typecho_Plugin::factory('admin/write-post.php')->bottom = array('EditorButton', 'render');
 Typecho_Plugin::factory('admin/write-page.php')->bottom = array('EditorButton', 'render');