From efcdf00ae30faeb334ea31d23086080f141f47c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Tue, 27 Aug 2024 21:42:17 +0200
Subject: [PATCH] a lot of small fixes to make a minimal commit

---
 includes/admin/class-settings-page.php  | 2 +-
 includes/{admin => }/class-settings.php | 2 +-
 includes/class-setup.php                | 9 +++++++++
 templates/settings.php                  | 7 +------
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename includes/{admin => }/class-settings.php (97%)

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index 2cd16dd..22c8b1a 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -88,7 +88,7 @@ class Settings_Page {
 		$event_terms = array();
 
 		foreach ( $event_plugins as $event_plugin_name => $events_plugin_info ) {
-			$event_terms[ $event_plugin_name ] = self::get_event_terms( $events_plugin_info );
+			$event_terms = array_merge( $event_terms, self::get_event_terms( $events_plugin_info ) );
 		}
 
 		$args = array(
diff --git a/includes/admin/class-settings.php b/includes/class-settings.php
similarity index 97%
rename from includes/admin/class-settings.php
rename to includes/class-settings.php
index 4b79127..f5e781a 100644
--- a/includes/admin/class-settings.php
+++ b/includes/class-settings.php
@@ -9,7 +9,7 @@
  * @since 1.0.0
  */
 
-namespace Activitypub_Event_Extensions\Admin;
+namespace Activitypub_Event_Extensions;
 
 use Activitypub\Activity\Extended_Object\Event;
 
diff --git a/includes/class-setup.php b/includes/class-setup.php
index 207cdb5..22119df 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -52,6 +52,7 @@ class Setup {
 			'post_type'         => 'event',
 			'settings_page_id'  => 'settings_page_vsel',
 			'transformer_class' => 'VS_Event',
+			'taxonomy'        => 'event_cat',
 		),
 	);
 
@@ -122,6 +123,14 @@ class Setup {
 		return $active_event_plugins;
 	}
 
+	/**
+	 * Getter function for the active event plugins.
+	 */
+	public function get_active_event_plugins() {
+		return $this->active_event_plugins;
+	}
+
+
 	/**
 	 * Set up hooks for various purposes.
 	 *
diff --git a/templates/settings.php b/templates/settings.php
index 6e0a6cb..9d5acf0 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -23,12 +23,7 @@ if ( ! current_user_can( 'manage_options' ) ) {
 	return;
 }
 
-$event_terms = get_terms(
-	array(
-		'taxonomy'   => 'tribe_events_cat',
-		'hide_empty' => true,
-	)
-);
+$event_terms = $args['event_terms'];
 
 $default_event_category_strings = array(
 	'ARTS'                          => __( 'Arts', 'activitypub-event-extensions' ),