From ad052f72a6c994dfb2fe0aa11970c9d110564004 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 10 Feb 2026 17:50:45 +0000
Subject: [PATCH] =Fix for FAQpage schema not outputting correctly, as well as Form.php status radios and editForm on CRUDSkeleton.php

---
 inc/blocks/CustomBlocks.php |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index f83b57d..1822fb5 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,10 +13,11 @@
 
 class CustomBlocks
 {
-    protected CacheManager $cache;
+    protected Cache $cache;
     public function __construct()
     {
-        $this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
+        $this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
+		$this->cache->connect('post')->connect('taxonomy');
 		add_filter('render_block', [$this, 'render'], 999, 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);
 //				}
@@ -654,7 +655,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 +1166,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