From ccf5e61a075c35d24befc175994b5cb8957ca322 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 26 Aug 2026 21:45:53 +0000
Subject: [PATCH] =Extra JVB() calls replaced, minor tweaks

---
 inc/rest/routes/ContentTermsRoutes.php |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/inc/rest/routes/ContentTermsRoutes.php b/inc/rest/routes/ContentTermsRoutes.php
index 8886996..8f2270a 100644
--- a/inc/rest/routes/ContentTermsRoutes.php
+++ b/inc/rest/routes/ContentTermsRoutes.php
@@ -261,9 +261,8 @@
 		$status = $request->get_param('status');
 		$page = (int)$request->get_param('page');
 
-		$cacheKey = $this->cache->generateKey(compact('termID', 'status', 'page'));
 
-		return $this->cache->remember($cacheKey, function() use ($termID, $status, $page) {
+		return $this->cache->remember(compact('termID', 'status', 'page'), function() use ($termID, $status, $page) {
 			$perPage = 20;
 			$offset = ($page - 1) * $perPage;
 
@@ -272,7 +271,7 @@
 			if ($status === 'active') {
 				$query = $query->where(['end_date' => null]);
 			} elseif ($status === 'inactive') {
-				$query = $query->whereNotNull('end_date');
+				$query = $query->where(['end_date'=> ['NOT NULL', null]]);
 			}
 
 			$total = $query->countResults();
@@ -334,9 +333,7 @@
 		$status = $request->get_param('status');
 		$page = (int)$request->get_param('page');
 
-		$cacheKey = $this->cache->generateKey(compact('termID', 'status', 'page'));
-
-		return $this->cache->remember($cacheKey, function() use ($termID, $status, $page) {
+		return $this->cache->remember(compact('termID', 'status', 'page'), function() use ($termID, $status, $page) {
 			$perPage = 20;
 			$offset = ($page - 1) * $perPage;
 

--
Gitblit v1.10.0