From 9fd0735e973c150c6f28a25bf84092a851bbcc76 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jul 2026 22:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=20page-header=20=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=EF=BC=9A=E4=B8=BB=E8=B7=AF=E5=BE=84=E6=94=B9=20$args?= =?UTF-8?q?=20=E5=A5=91=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit archive/search/page 不再用 aksrt_ph_* query-var 传参， page.php 同步对齐 content-shell 主结构。 --- archive.php | 11 +++--- page.php | 54 +++++++++++++------------- search.php | 11 +++--- templates/parts/page-header.php | 67 +++++++++++++++++++++------------ 4 files changed, 82 insertions(+), 61 deletions(-) diff --git a/archive.php b/archive.php index 1792a1b5..f976fcff 100644 --- a/archive.php +++ b/archive.php @@ -53,11 +53,12 @@ if (function_exists('aksrt_archive_open_shell')) { aksrt_render_admin_quick_link('post-list/list', __('列表样式设置', 'aksrt')); } $admin_link = trim((string) ob_get_clean()); - set_query_var('aksrt_ph_eyebrow', __('内容归档', 'aksrt')); - set_query_var('aksrt_ph_title', get_the_archive_title()); - set_query_var('aksrt_ph_desc', $archive_summary); - set_query_var('aksrt_ph_extra', $admin_link); - get_template_part('templates/parts/page-header'); + get_template_part('templates/parts/page-header', null, [ + 'eyebrow' => __('内容归档', 'aksrt'), + 'title' => get_the_archive_title(), + 'desc' => $archive_summary, + 'extra' => $admin_link, + ]); ?> " aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"> -
+
@@ -31,52 +31,54 @@ $show_sidebar = function_exists('aksrt_is_show_sidebar') ? aksrt_is_show_sidebar
-
"> +
get_the_title(), + ]; + if ($ph_style_override !== null) { + $header_args['style'] = $ph_style_override; + } + if ($page_cover !== '') { + $header_args['cover'] = esc_url($page_cover); + } ?>
> - + - +
- +
'', - ) - ); + wp_link_pages([ + 'before' => '', + ]); ?>
'; comments_template(); echo '
'; @@ -92,7 +94,7 @@ $show_sidebar = function_exists('aksrt_is_show_sidebar') ? aksrt_is_show_sidebar - +
diff --git a/search.php b/search.php index 76e72525..55091dfa 100644 --- a/search.php +++ b/search.php @@ -145,11 +145,12 @@ if (function_exists('aksrt_archive_open_shell')) { aksrt_render_admin_quick_link('page-display/other', __('搜索页设置', 'aksrt')); } $admin_link = trim((string) ob_get_clean()); - set_query_var('aksrt_ph_eyebrow', __('站内搜索', 'aksrt')); - set_query_var('aksrt_ph_title', $search_title); - set_query_var('aksrt_ph_desc', $search_desc); - set_query_var('aksrt_ph_extra', $admin_link); - get_template_part('templates/parts/page-header'); + get_template_part('templates/parts/page-header', null, [ + 'eyebrow' => __('站内搜索', 'aksrt'), + 'title' => $search_title, + 'desc' => $search_desc, + 'extra' => $admin_link, + ]); ?>
diff --git a/templates/parts/page-header.php b/templates/parts/page-header.php index 6867c1c5..6c51b542 100644 --- a/templates/parts/page-header.php +++ b/templates/parts/page-header.php @@ -2,49 +2,66 @@ /** * Reusable Page Header Template Part. * - * Renders a unified page header for archive / search / page templates. - * Style is driven by the global setting `page_header_style` with optional - * per-page post-meta override (`page_header_style`). + * Contract: get_template_part(..., null, $args) + * Prefer explicit $args over ambient query vars. * - * Query vars consumed (set via set_query_var before calling get_template_part): - * aksrt_ph_style – override style ('' | '1' | '2' | '3'), defaults to global setting - * aksrt_ph_eyebrow – eyebrow label text - * aksrt_ph_title – title HTML (already escaped by caller) - * aksrt_ph_desc – description text - * aksrt_ph_cover – cover image URL override - * aksrt_ph_extra – extra HTML appended inside the body area (e.g. admin quick-links) + * Args: + * style – '' | '1' | '2' | '3' | 'not' + * eyebrow – eyebrow label text + * title – title HTML (caller escapes) + * desc – description text + * cover – cover image URL override + * extra – extra HTML (caller escapes) * * @package AKSRT */ defined('ABSPATH') || exit; -// Resolve style: explicit query var > global setting. -$ph_style = get_query_var('aksrt_ph_style', null); +$args = is_array($args ?? null) ? $args : []; + +// Resolve style: explicit args > residual query var > global setting. +$ph_style = array_key_exists('style', $args) ? $args['style'] : null; +if ($ph_style === null) { + $ph_style = get_query_var('aksrt_ph_style', null); +} if ($ph_style === null) { $ph_style = class_exists('AKSRT_Settings') ? (AKSRT_Settings::get_other_page_settings()['header_style'] ?? '1') : '1'; } +if ($ph_style === 'not') { + $ph_style = ''; +} // '' means "don't show header" if ($ph_style === '') { return; } -$ph_eyebrow = get_query_var('aksrt_ph_eyebrow', ''); -$ph_title = get_query_var('aksrt_ph_title', ''); -$ph_desc = get_query_var('aksrt_ph_desc', ''); -$ph_extra = get_query_var('aksrt_ph_extra', ''); +$ph_eyebrow = array_key_exists('eyebrow', $args) + ? (string) $args['eyebrow'] + : (string) get_query_var('aksrt_ph_eyebrow', ''); +$ph_title = array_key_exists('title', $args) + ? (string) $args['title'] + : (string) get_query_var('aksrt_ph_title', ''); +$ph_desc = array_key_exists('desc', $args) + ? (string) $args['desc'] + : (string) get_query_var('aksrt_ph_desc', ''); +$ph_extra = array_key_exists('extra', $args) + ? (string) $args['extra'] + : (string) get_query_var('aksrt_ph_extra', ''); -// Cover image: explicit > global setting > post thumbnail. -$ph_cover = get_query_var('aksrt_ph_cover', ''); -if (empty($ph_cover) && class_exists('AKSRT_Settings')) { +// Cover image: explicit args > residual query var > global setting > post thumbnail. +$ph_cover = array_key_exists('cover', $args) + ? (string) $args['cover'] + : (string) get_query_var('aksrt_ph_cover', ''); +if ($ph_cover === '' && class_exists('AKSRT_Settings')) { $other = AKSRT_Settings::get_other_page_settings(); - $ph_cover = $other['header_cover_img'] ?? ''; + $ph_cover = (string) ($other['header_cover_img'] ?? ''); } -if (empty($ph_cover) && has_post_thumbnail()) { - $ph_cover = get_the_post_thumbnail_url(get_the_ID(), 'full'); +if ($ph_cover === '' && has_post_thumbnail()) { + $ph_cover = (string) get_the_post_thumbnail_url(get_the_ID(), 'full'); } // Map style value to CSS modifier class. @@ -57,13 +74,13 @@ if ($ph_style === '2') { // Cover inline style (for cover style). $cover_style = ''; -if ($ph_style === '3' && !empty($ph_cover)) { +if ($ph_style === '3' && $ph_cover !== '') { $cover_style = ' style="background-image:url(\'' . esc_url($ph_cover) . '\')"'; } ?>
- +
>
@@ -87,7 +104,7 @@ if ($ph_style === '3' && !empty($ph_cover)) {
- +
>