From 86c6cd3cc099d2480932ede03c12cea01e625c94 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 26 Apr 2026 21:56:28 +0000
Subject: [PATCH] =Requiring files based on Site class settings
---
inc/blocks/CustomBlocks.php | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index f83b57d..f0c0f9d 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -3,7 +3,7 @@
use DateTime;
use DOMDocument;
-use JVBase\managers\CacheManager;
+use JVBase\managers\Cache;
use WP_Block;
use WP_Query;
@@ -13,11 +13,12 @@
class CustomBlocks
{
- protected CacheManager $cache;
+ protected Cache $cache;
public function __construct()
{
- $this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
- add_filter('render_block', [$this, 'render'], 999, 3);
+ $this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
+ $this->cache->connect('post')->connect('taxonomy');
+ add_filter('render_block', [$this, 'render'], 900, 3);
add_action('init', [$this, 'registerBlockStyles']);
}
@@ -72,16 +73,16 @@
if (function_exists($function)) {
return $function($block, $content);
// return $this->cache->remember(
-// $block,
+// get_the_ID(),
// function () use ($function, $block, $content) {
// return $function($block, $content);
// }
// );
} else if (method_exists($this, $method)) {
return $this->$method($block, $content);
-
+//
// return $this->cache->remember(
-// $block,
+// get_the_ID(),
// function () use ($method, $block, $content) {
// return $this->$method($block, $content);
// }
@@ -397,7 +398,7 @@
if ($cite !== '') {
$content = $this->stripTagContents('cite', $content);
}
- $content = apply_filters('the_content', $content);
+ $content = jvb_filter_content( $content);
return '<blockquote'.$this->getClassesAndStyles($block['attrs'], ['pull']).'>'.
$content.
@@ -612,13 +613,19 @@
'main';
if ($content == '') {
- global $post;
+ if(is_singular()) {
+ global $post;
- $block['innerBlocks'] = parse_blocks($post->post_content);
- return $this->innerBlocks($block);
+ $block['innerBlocks'] = parse_blocks($post->post_content);
+ $result = $this->innerBlocks($block);
+ }else {
+ $result = '';
+ }
} else {
- return $this->inside($block, $tag, $content);
+ $result = $this->inside($block, $tag, $content);
}
+
+ return apply_filters('jvb_post_content_output', $result, $block);
}
//core_post_date
public function render_core_post_date(array $block):string
@@ -632,14 +639,14 @@
global $post;
$ID = get_post_thumbnail_id($post->ID);
$aOpen = $aClose = '';
- if(!is_single($ID)) {
+ if(!is_single($post->ID)) {
$aOpen = '<a href="'.get_the_permalink($post->ID).'">';
$aClose = '</a>';
}
- return $aOpen.'<figure'.$this->getClassesAndStyles($block['attrs']).'>'.
+ return '<figure'.$this->getClassesAndStyles($block['attrs']).'>'.$aOpen.
apply_filters('jvbCoreFeaturedImage', $this->image($ID), $post->post_type).
- '</figure>'.$aClose;
+ $aClose.'</figure>';
}
//core_post_navigation_link
//core_post_template
@@ -654,7 +661,7 @@
$out .= '<li>'.$block['attrs']['prefix'].'</li>';
}
foreach($terms as $term) {
- $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.$term->name.'</a></li>';
+ $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.html_entity_decode($term->name).'</a></li>';
}
if (array_key_exists('suffix', $block['attrs'])) {
$out .= '<li>'.$block['attrs']['suffix'].'</li>';
@@ -1165,11 +1172,9 @@
$classes[] = $class;
}
}
- $classes = array_filter($classes, function ($class) {
- return $class!=='' && !str_starts_with($class, 'wp');
- });
-
- return $classes;
+ return array_filter($classes, function ($class) {
+ return $class!=='' && !str_starts_with($class, 'wp');
+ });
}
protected function getClass(string $key, string|bool|array|int $value, array $attrs):string|array
{
--
Gitblit v1.10.0