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.
---
base/_setup.php | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/base/_setup.php b/base/_setup.php
index 9e46047..544b7e0 100644
--- a/base/_setup.php
+++ b/base/_setup.php
@@ -1,13 +1,23 @@
<?php
-require(JVB_DIR.'/base/site.php');
-require(JVB_DIR.'/base/content.php');
+use JVBase\base\Site;
+
+require(JVB_DIR.'/base/Site.php');
+
+
+add_action('plugins_loaded', 'jvbDefineSite', 1);
+function jvbDefineSite() {
+ Site::getInstance();
+}
+//require(JVB_DIR.'/base/content.php');
+require(JVB_DIR.'/base/colours.php');
require(JVB_DIR.'/base/email.php');
-require(JVB_DIR.'/base/taxonomies.php');
-require(JVB_DIR.'/base/users.php');
-require(JVB_DIR.'/base/login.php');
-require(JVB_DIR.'/base/membership.php');
-require(JVB_DIR.'/base/options.php');
+//require(JVB_DIR.'/base/taxonomies.php');
+//require(JVB_DIR.'/base/users.php');
+require(JVB_DIR.'/base/Login.php');
+require(JVB_DIR.'/base/Membership.php');
+require(JVB_DIR.'/base/Options.php');
+require(JVB_DIR.'/base/SchemaHelper.php');
$base = apply_filters('jvb_base', 'jvb_');
$base = (str_ends_with($base, '_')) ? $base : $base.'_';
--
Gitblit v1.10.0