From bf067ce93a2613c36c35374c336767f254c23edc Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 31 Jul 2022 14:20:12 +0000
Subject: [PATCH] Plugins: Introduce `did_filter()` function.

While most of the action functions are aliases for the respective filter functions, using `did_action()` to detect whether a filter has been run is not possible, as it only works specifically for actions.

This is now resolved by introducing a new function, `did_filter()`, which retrieves the number of times a filter has been applied during the current request, bringing parity with `did_action()`.

Follow-up to [4630], [6318], [27294].

Props mordauk, chriscct7, andykeith, nacin, dd32, markparnell, SergeyBiryukov.
Fixes #35357.
Built from https://develop.svn.wordpress.org/trunk@53803


git-svn-id: http://core.svn.wordpress.org/trunk@53362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/plugin.php  | 45 +++++++++++++++++++++++++++++++++++++++--
 wp-includes/version.php |  2 +-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 5e9ccf08ca..3eafa3a28b 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -30,6 +30,9 @@ global $wp_filter;
 /** @var int[] $wp_actions */
 global $wp_actions;
 
+/** @var int[] $wp_filters */
+global $wp_filters;
+
 /** @var string[] $wp_current_filter */
 global $wp_current_filter;
 
@@ -43,6 +46,10 @@ if ( ! isset( $wp_actions ) ) {
 	$wp_actions = array();
 }
 
+if ( ! isset( $wp_filters ) ) {
+	$wp_filters = array();
+}
+
 if ( ! isset( $wp_current_filter ) ) {
 	$wp_current_filter = array();
 }
@@ -155,6 +162,7 @@ function add_filter( $hook_name, $callback, $priority = 10, $accepted_args = 1 )
  *              by adding it to the function signature.
  *
  * @global WP_Hook[] $wp_filter         Stores all of the filters and actions.
+ * @global int[]     $wp_filters        Stores the number of times each filter was triggered.
  * @global string[]  $wp_current_filter Stores the list of current filters with the current one last.
  *
  * @param string $hook_name The name of the filter hook.
@@ -163,7 +171,13 @@ function add_filter( $hook_name, $callback, $priority = 10, $accepted_args = 1 )
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
 function apply_filters( $hook_name, $value, ...$args ) {
-	global $wp_filter, $wp_current_filter;
+	global $wp_filter, $wp_filters, $wp_current_filter;
+
+	if ( ! isset( $wp_filters[ $hook_name ] ) ) {
+		$wp_filters[ $hook_name ] = 1;
+	} else {
+		++$wp_filters[ $hook_name ];
+	}
 
 	// Do 'all' actions first.
 	if ( isset( $wp_filter['all'] ) ) {
@@ -204,6 +218,7 @@ function apply_filters( $hook_name, $value, ...$args ) {
  *                      functions hooked to `$hook_name` are supplied using an array.
  *
  * @global WP_Hook[] $wp_filter         Stores all of the filters and actions.
+ * @global int[]     $wp_filters        Stores the number of times each filter was triggered.
  * @global string[]  $wp_current_filter Stores the list of current filters with the current one last.
  *
  * @param string $hook_name The name of the filter hook.
@@ -211,7 +226,13 @@ function apply_filters( $hook_name, $value, ...$args ) {
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
 function apply_filters_ref_array( $hook_name, $args ) {
-	global $wp_filter, $wp_current_filter;
+	global $wp_filter, $wp_filters, $wp_current_filter;
+
+	if ( ! isset( $wp_filters[ $hook_name ] ) ) {
+		$wp_filters[ $hook_name ] = 1;
+	} else {
+		++$wp_filters[ $hook_name ];
+	}
 
 	// Do 'all' actions first.
 	if ( isset( $wp_filter['all'] ) ) {
@@ -377,6 +398,26 @@ function doing_filter( $hook_name = null ) {
 	return in_array( $hook_name, $wp_current_filter, true );
 }
 
+/**
+ * Retrieves the number of times a filter has been applied during the current request.
+ *
+ * @since 6.1.0
+ *
+ * @global int[] $wp_filters Stores the number of times each filter was triggered.
+ *
+ * @param string $hook_name The name of the filter hook.
+ * @return int The number of times the filter hook has been applied.
+ */
+function did_filter( $hook_name ) {
+	global $wp_filters;
+
+	if ( ! isset( $wp_filters[ $hook_name ] ) ) {
+		return 0;
+	}
+
+	return $wp_filters[ $hook_name ];
+}
+
 /**
  * Adds a callback function to an action hook.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b746d386d5..cb0a1f8278 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53802';
+$wp_version = '6.1-alpha-53803';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.