Merge pull request #4 from a8cteam51/fix/flush-rewrites

Fix: Defer rewrite rules flush until after init hook

Author: Ninodevo

README.md

@@ -5,7 +5,7 @@
 **Requires at least:** 6.5  
 **Tested up to:** 6.5  
 **Requires PHP:** 8.3  
-**Stable tag:** 1.0.0  
+**Stable tag:** 1.0.4  
 **License:** GPLv3 or later  
 **License URI:** <http://www.gnu.org/licenses/gpl-3.0.html>  
 

restrict-media-file-access.php

@@ -14,7 +14,7 @@
  * Plugin Name:             Restrict Media File Access
  * Plugin URI:              https://wpspecialprojects.wordpress.com
  * Description:             Restrict access to media files by custom access control.
- * Version:                 1.0.3
+ * Version:                 1.0.4
  * Requires at least:       6.4
  * Tested up to:            6.8
  * Requires PHP:            8.3
@@ -98,7 +98,8 @@ function () {
 			}
 		}
 
-		// Flush rewrite rules to ensure the new rewrite rules are loaded.
-		flush_rewrite_rules();
+		// Set a flag to flush rewrite rules after init has fired.
+		// This ensures rewrite rules are registered before flushing.
+		set_transient( '_rmfa_flush_rewrite_rules', true, 60 );
 	}
 );

src/RewriteRules.php

@@ -25,6 +25,9 @@ public function initialize(): void {
 
 		// Setup query vars
 		add_filter( 'query_vars', array( $this, 'add_query_vars' ) );
+
+		// Flush rewrite rules after init if activation flag is set.
+		add_action( 'init', array( $this, 'maybe_flush_rewrite_rules' ), 999 );
 	}
 
 	/**
@@ -58,4 +61,21 @@ public function add_query_vars( array $query_vars ): array {
 
 		return $query_vars;
 	}
+
+	/**
+	 * Flush rewrite rules if activation flag is set.
+	 *
+	 * This ensures rewrite rules are registered before flushing.
+	 *
+	 * @since   1.0.3
+	 * @version 1.0.3
+	 *
+	 * @return void
+	 */
+	public function maybe_flush_rewrite_rules(): void {
+		if ( false !== get_transient( '_rmfa_flush_rewrite_rules' ) ) {
+			flush_rewrite_rules();
+			delete_transient( '_rmfa_flush_rewrite_rules' );
+		}
+	}
 }

src/Settings.php

@@ -35,11 +35,9 @@ public function initialize(): void {
 	 * @since   1.0.0
 	 * @version 1.0.0
 	 *
-	 * @param string $hook The current admin page hook.
-	 *
 	 * @return void
 	 */
-	public function enqueue_assets( string $hook ): void {
+	public function enqueue_assets(): void {
 
 		$rmfa_media = restrict_media_file_access_get_asset_meta( RESTRICT_MEDIA_FILE_ACCESS_DIR_PATH . 'assets/admin/css/media.css' );