From 75a097a018a0090f5902758353c578fce4aa2a25 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sat, 23 May 2026 18:43:42 +0000
Subject: [PATCH] =CustomBlocks.php overhaul relatively complete. Also refactored the gallery in gallery.min.js and the jvbRenderGallery.
---
inc/managers/queue/mergers/DefaultMerger.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/inc/managers/queue/mergers/DefaultMerger.php b/inc/managers/queue/mergers/DefaultMerger.php
index 9eaf6ae..7cae0b2 100644
--- a/inc/managers/queue/mergers/DefaultMerger.php
+++ b/inc/managers/queue/mergers/DefaultMerger.php
@@ -26,7 +26,7 @@
public function merge(Operation $existing, Operation $incoming): Operation
{
foreach ((array) $this->chunkKey as $key) {
- $existing->requestData[$key] = array_merge(
+ $existing->requestData[$key] = array_replace(
$existing->requestData[$key] ?? [],
$incoming->requestData[$key] ?? []
);
@@ -35,4 +35,8 @@
$existing->totalItems += $incoming->totalItems;
return $existing;
}
+ public function matchCriteria(Operation $incoming): array
+ {
+ return [];
+ }
}
--
Gitblit v1.10.0