From f4be611c51473359e6d41780f0313c446079e9d3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 09 Jun 2026 15:19:24 +0000
Subject: [PATCH] =Switched the /base/options.php to the same pattern as Site.php: a class based approached rather than a filter. Updated Meta.php to play along with the defined fields from there in Meta::forOptions. Had to change openingHoursSpecificationsTrait.php to not use the translater functions __('text','textdomain') for now, as we load before init.
---
inc/registrar/config/Integration.php | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/inc/registrar/config/Integration.php b/inc/registrar/config/Integration.php
index c1cbac4..3b9a6a3 100644
--- a/inc/registrar/config/Integration.php
+++ b/inc/registrar/config/Integration.php
@@ -13,7 +13,7 @@
* @var string Must match as defined in the JVBase\integrations namespace
*/
protected string $service_name;
- protected string $content_type;
+ protected ?string $content_type = null;
/**
* @var bool Whether to send to the integration on publish
*/
@@ -38,18 +38,27 @@
$this->service_name = $service;
}
+
public function getService_name():string
{
return $this->service_name;
}
/**
- * @param string $content must match what integration expects
+ * @param ?string $content must match what integration expects
* @return self
*/
- public function setContent_type(string $content):self
+ public function setContentType(?string $content):self
{
- $allowed = JVB()->connect($this->service_name)->allowedContent();
+ if (is_null($content)) {
+ return $this;
+ }
+ $connection = JVB()->connect($this->service_name);
+ if (!$connection){
+ error_log('[Integration]::setContentType Service is not setup. '.$this->service_name);
+ return $this;
+ }
+ $allowed = $connection->getAllowedContent();
if (!in_array($content, $allowed)) {
error_log($this->service_name.' Connection does not support this content: '.$content);
return $this;
@@ -58,7 +67,7 @@
return $this;
}
- public function getContentType():string
+ public function getContentType():?string
{
return $this->content_type;
}
--
Gitblit v1.10.0