fix: refactor snippet execution logic for multisite support by centralizing trashed snippet handling

Author: imantsk

src/php/class-db.php

@@ -327,13 +327,7 @@ public function fetch_active_snippets( array $scopes ): array {
 					$id = intval( $snippet['id'] );
 					$active_value = intval( $snippet['active'] );
 
-					// Skip if snippet is trashed.
-					if ( -1 === $active_value ) {
-						continue;
-					}
-
-          // Skip if snippet is not active and not in the list of active shared snippets.
-					if ( 1 !== $active_value && ! in_array( $id, $active_shared_ids, true ) ) {
+					if ( ! self::is_network_snippet_enabled( $active_value, $id, $active_shared_ids ) ) {
 						continue;
 					}
 
@@ -353,4 +347,28 @@ public function fetch_active_snippets( array $scopes ): array {
 
 		return $active_snippets;
 	}
+
+	/**
+	 * Determine whether a network snippet should execute on the current site.
+	 *
+	 * Network snippets execute when active=1, or when the snippet is listed as active-shared for the site.
+	 * Trashed snippets (active=-1) never execute.
+	 *
+	 * @param int   $active_value      Raw active value from the snippet record.
+	 * @param int   $snippet_id        Snippet ID.
+	 * @param int[] $active_shared_ids Active shared network snippet IDs for the current site.
+	 *
+	 * @return bool
+	 */
+	public static function is_network_snippet_enabled( int $active_value, int $snippet_id, array $active_shared_ids ): bool {
+		if ( -1 === $active_value ) {
+			return false;
+		}
+
+		if ( 1 === $active_value ) {
+			return true;
+		}
+
+		return in_array( $snippet_id, $active_shared_ids, true );
+	}
 }

src/php/flat-files/classes/class-snippet-files.php

@@ -292,12 +292,7 @@ public static function get_active_snippets_from_flat_files(
 					$id = intval( $snippet['id'] );
 					$active_value = intval( $snippet['active'] );
 
-					// Never execute trashed snippets (active = -1).
-					if ( -1 === $active_value ) {
-						continue;
-					}
-
-					if ( 1 !== $active_value && ! in_array( $id, $active_shared_ids, true ) ) {
+					if ( ! DB::is_network_snippet_enabled( $active_value, $id, $active_shared_ids ) ) {
 						continue;
 					}
 
@@ -378,26 +373,16 @@ private static function load_active_snippets_from_file(
 		}
 
 		$file_snippets = require $snippets_file_path;
+		$shared_ids = is_array( $active_shared_ids )
+			? array_map( 'intval', $active_shared_ids )
+			: [];
 
 		$filtered_snippets = array_filter(
 			$file_snippets,
-			function ( $snippet ) use ( $scopes, $active_shared_ids ) {
+			function ( $snippet ) use ( $scopes, $shared_ids ) {
 				$active_value = isset( $snippet['active'] ) ? intval( $snippet['active'] ) : 0;
 
-				// Never treat trashed snippets as active.
-				if ( -1 === $active_value ) {
-					return false;
-				}
-
-				$is_active = 1 === $active_value;
-
-				if ( null !== $active_shared_ids ) {
-					$is_active = $is_active || in_array(
-						intval( $snippet['id'] ),
-						$active_shared_ids,
-						true
-					);
-				}
+				$is_active = DB::is_network_snippet_enabled( $active_value, intval( $snippet['id'] ), $shared_ids );
 
 				return ( $is_active || 'condition' === $snippet['scope'] ) && in_array( $snippet['scope'], $scopes, true );
 			}