From 48721c85ebcfa973ee81719d2467ca80e4253dc9 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 01 May 2026 17:30:03 +0000
Subject: [PATCH] =Edmonton Ink hard test begins! Real testing of the managers and reset routes will commence. So far, just ensuring our classes are all loaded correctly: Site() and its sub-classes Membership, Login, etc. Care should be taken to load conditionally on 'init', as we finish defining most settings by 'plugins_loaded' at priority 5
---
jvb.php | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/jvb.php b/jvb.php
index b326bb1..d400ce2 100644
--- a/jvb.php
+++ b/jvb.php
@@ -11,10 +11,9 @@
use JVBase\JVB;
use JVBase\managers\IconsManager;
-use JVBase\meta\Meta;
use JVBase\registrar\Registrar;
-use JVBase\utility\Features;
+use JVBase\base\Site;
//security
if (!defined('ABSPATH')) {
@@ -85,9 +84,10 @@
define('JVB_TESTING', str_contains(get_home_url(),'.test'));
-if (JVB_TESTING) {
+//if (!JVB_TESTING) {
add_filter('show_admin_bar', '__return_false');
-}
+//}
+
//if (JVB_TESTING) {
// error_log('In testing mode...');
//} else {
@@ -107,15 +107,10 @@
require(JVB_DIR.'/base/_setup.php');
-if (empty(JVB_SITE)) {
- return;
-}
require(JVB_DIR.'/inc/utility/setup.php');
require(JVB_DIR.'/checks.php');
-
-require(JVB_DIR . '/inc/registry/_setup.php');
-
+require(JVB_DIR . '/inc/registrar/_setup.php');
require(JVB_DIR . '/activate.php');
require(JVB_DIR . '/inc/helpers/all.php');
@@ -245,6 +240,8 @@
+
+
require(JVB_DIR . '/inc/blocks/_setup.php');
@@ -283,7 +280,7 @@
{
add_action('wp_head', 'jvbInlineNavStyles');
- if (Features::forSite()->has('dashboard')) {
+ if (Site::has('dashboard')) {
wp_enqueue_script('jvb-queue');
}
@@ -297,13 +294,13 @@
$interactions = [];
- if (Features::forSite()->has('favourites')) {
+ if (Site::has('favourites')) {
$interactions[] = 'favourites';
}
if (!empty(Registrar::getFeatured('karma'))) {
$interactions[] = 'karma';
}
- if (Features::forSite()->has('notifications')) {
+ if (Site::has('notifications')) {
$interactions[] = 'notifications';
}
@@ -330,7 +327,7 @@
window.userFavourites = {};
window.userVotes = {};
';
- if (Features::forSite()->has('favourites')) {
+ if (Site::has('favourites')) {
wp_enqueue_script('jvb-favourites');
$initUserSettings .= '
//Fetch user favourites
@@ -430,7 +427,7 @@
// ');
// }
}
- if (is_user_logged_in() && Features::forSite()->has('notifications')) {
+ if (is_user_logged_in() && Site::has('notifications')) {
wp_enqueue_script('jvb-notifications');
wp_localize_script('jvb-notifications', 'notificationSettings', array(
--
Gitblit v1.10.0