✨ 优化PHP8.1/2的兼容及首行缩进系统内容区域的错位

Licoy · Apr 24, 2023 · 06f2ad9 · 06f2ad9
1 parent a3f461c
commit 06f2ad9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/assets/dist/style/libs.min.css b/assets/dist/style/libs.min.css
diff --git a/assets/dist/style/style.min.css b/assets/dist/style/style.min.css
diff --git a/assets/style/style.less b/assets/style/style.less
@@ -1090,7 +1090,7 @@ a:hover {
   .entry-content, .entry-content-box {
     font-size: 15px;
 
-    &.p-indent > p {
+    &.p-indent > p:not(.no-indent) {
       text-indent: 2rem;
     }
 

diff --git a/inc/fun/comment.php b/inc/fun/comment.php
@@ -76,11 +76,11 @@ class="hide-info animated bounceIn c-sub-a t-sm ml-1 comment-reply"
             <div class="comment-os c-sub">
                 <?php
                 if (pk_is_checked('comment_show_ua', true)):
-                    $commentUserAgent = parse_user_agent($comment->comment_agent);
+                    $commentUserAgent = \donatj\UserAgent\parse_user_agent($comment->comment_agent);
                     $commentOsIcon = pk_get_comment_ua_os_icon($commentUserAgent['platform']);
                     $commentBrowserIcon = pk_get_comment_ua_os_icon($commentUserAgent['browser']);
-                    echo "<span class='mt10' title='${commentUserAgent['platform']}'><i class='$commentOsIcon'></i>&nbsp;<span>${commentUserAgent['platform']}&nbsp;</span></span>";
-                    echo "<span class='mt10' title='${commentUserAgent['browser']} ${commentUserAgent['version']}'><i class='$commentBrowserIcon'></i>&nbsp;<span>${commentUserAgent['browser']}</span></span>";
+                    echo "<span class='mt10' title='{$commentUserAgent['platform']}'><i class='$commentOsIcon'></i>&nbsp;<span>{$commentUserAgent['platform']}&nbsp;</span></span>";
+                    echo "<span class='mt10' title='{$commentUserAgent['browser']} {$commentUserAgent['version']}'><i class='$commentBrowserIcon'></i>&nbsp;<span>{$commentUserAgent['browser']}</span></span>";
                 endif;
                 ?>
                 <?php

diff --git a/inc/fun/short-code.php b/inc/fun/short-code.php
@@ -217,7 +217,7 @@ function pk_password_read($attr, $content = null)
     ), $attr));
     $out = '';
     $error = '';
-    if (empty(trim($desc))) {
+    if (empty(trim($desc ?? ''))) {
         $desc = "此处含有隐藏内容，需要正确输入密码后可见！";
     }
     $info = "<p class='fs14 c-sub'><i class='fa-regular fa-eye'></i>&nbsp;{$desc}</p>";

diff --git a/single.php b/single.php
@@ -42,7 +42,7 @@ class="fa-regular fa-pen-to-square mr-1"></i><?php _e('编辑', PUOCK) ?>
                     <div class="mt20 entry-content-box">
                         <div class="<?php get_entry_content_class() ?> content-main puock-text <?php pk_checked_out('post_content_indent', 'p-indent') ?>">
                             <?php if (pk_is_checked('post_read_time')): ?>
-                                <p class="fs14 c-sub">
+                                <p class="fs14 c-sub no-indent">
                                     <i class="fa-regular fa-clock"></i>
                                     <?php echo pk_read_time_tip() ?>
                                 </p>