From c6d2aaa580f70242a4ef832bc4ec22c09d71ecff Mon Sep 17 00:00:00 2001 From: marcusquinn <6428977+marcusquinn@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:15:42 +0100 Subject: [PATCH 1/2] Fix issue #10: Load Sites_Schema class in Sunrise to prevent database errors --- inc/class-sunrise.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/class-sunrise.php b/inc/class-sunrise.php index c7240dbbe..6a02c6b9b 100644 --- a/inc/class-sunrise.php +++ b/inc/class-sunrise.php @@ -137,9 +137,11 @@ public static function load_dependencies(): void { require_once __DIR__ . '/class-settings.php'; require_once __DIR__ . '/limits/class-plugin-limits.php'; require_once __DIR__ . '/limits/class-theme-limits.php'; - require_once __DIR__ . '/limits/class-theme-limits.php'; require_once __DIR__ . '/models/class-membership.php'; + // Make sure we have all the necessary database classes loaded + require_once __DIR__ . '/database/sites/class-sites-schema.php'; + } /** From c575c3c1e47968bd977bf828e79ac9905d08438e Mon Sep 17 00:00:00 2001 From: marcusquinn <6428977+marcusquinn@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:42:42 +0100 Subject: [PATCH 2/2] Fix issue #10: Load all necessary database classes in Sunrise to prevent database errors --- inc/class-sunrise.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/inc/class-sunrise.php b/inc/class-sunrise.php index 6a02c6b9b..e81d5c776 100644 --- a/inc/class-sunrise.php +++ b/inc/class-sunrise.php @@ -140,7 +140,19 @@ public static function load_dependencies(): void { require_once __DIR__ . '/models/class-membership.php'; // Make sure we have all the necessary database classes loaded + // BerlinDB core classes + if (file_exists(__DIR__ . '/../vendor/berlindb/core/src/Database/Base.php')) { + require_once __DIR__ . '/../vendor/berlindb/core/src/Database/Base.php'; + require_once __DIR__ . '/../vendor/berlindb/core/src/Database/Query.php'; + require_once __DIR__ . '/../vendor/berlindb/core/src/Database/Row.php'; + require_once __DIR__ . '/../vendor/berlindb/core/src/Database/Schema.php'; + require_once __DIR__ . '/../vendor/berlindb/core/src/Database/Table.php'; + } + + // Site database classes require_once __DIR__ . '/database/sites/class-sites-schema.php'; + require_once __DIR__ . '/database/sites/class-site-query.php'; + require_once __DIR__ . '/database/sites/class-site.php'; }