fix: add manually marked reason again

pluginkollektiv · Jul 23, 2023 · 7a1e0ed · 7a1e0ed
1 parent c3f760b
commit 7a1e0ed
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/src/Handlers/PluginUpdate.php b/src/Handlers/PluginUpdate.php
@@ -97,7 +97,7 @@ private static function maybe_update_database() {
 			'<'
 		) ) {
 			// Update options (we migrate to a new option name `antispam_bee_options` in this release).
-			$options = get_option( 'antispam_bee' );
+			$options = get_option( 'antispam_bee', [] );
 
 			$allowed_languages = self::convert_multiselect_values( $options['translate_lang'] ?? [] );
 

diff --git a/src/Handlers/Reaction.php b/src/Handlers/Reaction.php
@@ -18,15 +18,17 @@ public static function init() {
 			1
 		);
 
-		add_action( 'transition_comment_status', [ __CLASS__, 'handle_comment_status_changes' ], 10, 3 );
-
 		// Add our manual spam reason to the list of reasons.
 		add_filter( 'antispam_bee_additional_spam_reasons', function ( $reasons ) {
 			$reasons['asb-marked-manually'] = __( 'Manually', 'antispam-bee' );
 			return $reasons;
 		} );
 	}
 
+	public static function always_init() {
+		add_action( 'transition_comment_status', [ __CLASS__, 'handle_comment_status_changes' ], 10, 3 );
+	}
+
 	public static function process( $reaction ) {
 		// phpcs:enable WordPress.Security.NonceVerification.Missing
 		$rules   = new Rules( static::$type );

diff --git a/src/load.php b/src/load.php
@@ -17,7 +17,6 @@
 use AntispamBee\GeneralOptions\Uninstall;
 use AntispamBee\Handlers\Comment;
 use AntispamBee\Handlers\PluginStateChangeHandler;
-use AntispamBee\Handlers\PluginUpdate;
 use AntispamBee\Handlers\Linkback;
 use AntispamBee\Helpers\Settings;
 use AntispamBee\Helpers\SpamReasonTextHelper;
@@ -43,18 +42,8 @@
  * Init function of the plugin
  */
 function init() {
-	$disallow_ajax = apply_filters( 'antispam_bee_disallow_ajax_calls', true );
-
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX && $disallow_ajax ) {
-		return;
-	}
-
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		return;
-	}
-
 	// Construct all modules to initialize.
-	$modules = array(
+	$modules = [
 		DashboardWidgets::class,
 		new SettingsPage(),
 		CommentsColumns::class,
@@ -88,10 +77,26 @@ function init() {
 		LinkbackFromMyself::class,
 		LinkbackPostTitleIsBlogName::class,
 		ValidGravatar::class,
-	);
+	];
+
+	$disallow_ajax = apply_filters( 'antispam_bee_disallow_ajax_calls', true );
+
+	$is_ajax_call = defined( 'DOING_AJAX' ) && DOING_AJAX;
 
 	// Initialize all modules.
 	foreach ( $modules as $module ) {
+		if ( is_callable( [ $module, 'always_init' ] ) ) {
+			call_user_func( [ $module, 'always_init' ] );
+		}
+
+		if ( $is_ajax_call && $disallow_ajax ) {
+			continue;
+		}
+
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			continue;
+		}
+
 		if ( is_callable( [ $module, 'init' ] ) ) {
 			call_user_func( [ $module, 'init' ] );
 		}