Merge branch 'main' into join_ignore

phpcs
Fix typos in Readme
2025-01-04 09:38:35 +01:00 · 2025-01-04 09:36:49 +01:00 · 2025-01-04 08:43:33 +01:00 · 2025-01-03 21:11:27 +01:00 · 2025-01-03 21:08:14 +01:00 · 2024-12-31 14:05:48 +01:00
2 changed files with 6 additions and 14 deletions
--- a/README.md
+++ b/README.md
@ -105,7 +105,13 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma

 ## Acknowledgement

+<<<<<<< HEAD
+### [0.3.4] 2024-12-21 ###
+
+* Initial release on https://wordpress.org/
+=======
 [<img src="./assets/img/acknowledgement-NLnet.svg" alt="NLnet foundation logo" width="20%" style="margin: 10px 5% 10px 5%;"/>](https://nlnet.nl)
 [<img src="./assets/img/acknowledgement-NGI0Entrust.svg" alt="NGI Zero Logo" width="20%" style="margin: 10px 5% 10px 5%;"/>](https://nlnet.nl/entrust)

 The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594.
+>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a
--- a/templates/welcome.php
+++ b/templates/welcome.php
@ -1,10 +1,8 @@
 <?php
 /**
- * Status page for the Event Bridge for ActivityPub.
 * Status page for the Event Bridge for ActivityPub.
 *
 * @package Event_Bridge_For_ActivityPub
- * @package Event_Bridge_For_ActivityPub
 */

 // Exit if accessed directly.
@ -23,9 +21,6 @@ use Event_Bridge_For_ActivityPub\Admin\Health_Check;
 	)
 );

-$active_event_plugins                   = Setup::get_instance()->get_active_event_plugins();
-$event_bridge_for_activitypub_status_ok = true;
-$example_event_post                     = Health_Check::get_most_recent_event_posts();
 $active_event_plugins                   = Setup::get_instance()->get_active_event_plugins();
 $event_bridge_for_activitypub_status_ok = true;
 $example_event_post                     = Health_Check::get_most_recent_event_posts();
@ -43,18 +38,9 @@ WP_Filesystem();

 ?>

-<div class="event-bridge-for-activitypub-settings event-bridge-for-activitypub-settings-page hide-if-no-js">
 <div class="event-bridge-for-activitypub-settings event-bridge-for-activitypub-settings-page hide-if-no-js">
 	<div class="box">
 		<h2><?php \esc_html_e( 'Status', 'event-bridge-for-activitypub' ); ?></h2>
-		<p><?php \esc_html_e( 'The Event Bridge for ActivityPub detected the following (activated) event plugins:', 'event-bridge-for-activitypub' ); ?></p>
-			<?php
-			if ( empty( $active_event_plugins ) ) {
-				$notice = General_Admin_Notices::get_admin_notice_no_supported_event_plugin_active();
-				echo '<p>⚠' . \wp_kses( $notice, General_Admin_Notices::ALLOWED_HTML ) . '</p>';
-			}
-			?>
-		<h2><?php \esc_html_e( 'Status', 'event-bridge-for-activitypub' ); ?></h2>
 		<p><?php \esc_html_e( 'The Event Bridge for ActivityPub detected the following (activated) event plugins:', 'event-bridge-for-activitypub' ); ?></p>
 			<?php
 			if ( empty( $active_event_plugins ) ) {