From a9654f00c8fbc9934289d761843ddd071025013f Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 28 Aug 2026 17:20:28 +0000
Subject: [PATCH] =PHPStorm Code Inspection: fixed class reference errors (from getting rid of JVB() and replacing with direct class::getInstance; as well as general code sniffing, etc

---
 base/_setup.php |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/base/_setup.php b/base/_setup.php
index e8d7871..f4170bd 100644
--- a/base/_setup.php
+++ b/base/_setup.php
@@ -1,13 +1,27 @@
 <?php
 
-require(JVB_DIR.'/base/site.php');
-require(JVB_DIR.'/base/content.php');
+if (!defined('ABSPATH')) {
+	exit;
+}
+
+use JVBase\base\Site;
+
+require(JVB_DIR.'/base/Site.php');
+
+
+add_action('plugins_loaded', 'jvbDefineSite', 1);
+function jvbDefineSite():void {
+	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.'_';
@@ -18,3 +32,14 @@
 
 $childURL = apply_filters('jvbChildUrl', JVB_URL);
 define('JVB_CHILD_URL', $childURL);
+
+
+function jvbDefaultIcon():string
+{
+	return apply_filters('jvbDefaultIcon', 'arrows-clockwise');
+}
+
+function jvbLogoIcon():string
+{
+	return apply_filters('jvbLogoIcon', 'logo');
+}

--
Gitblit v1.10.0