From 474711aac1f90d5183ca2d1997b5ad7b2e39ba02 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 25 Jun 2017 22:16:40 +0000
Subject: [PATCH] Docs: Adjust notation for the `$context` parameter in the
 DocBlocks for the `wp_kses_allowed_html()` function and its associated
 `wp_kses_allowed_html` filter.

`$context|$allowedtags` can be either a string or array.

Props bor0.
Fixes #40575.

Built from https://develop.svn.wordpress.org/trunk@40950


git-svn-id: http://core.svn.wordpress.org/trunk@40800 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/kses.php    | 11 +++++------
 wp-includes/version.php |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index 41dc7f2d94..c95b0179f2 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -615,9 +615,9 @@ function wp_kses_one_attr( $string, $element ) {
  * @global array $allowedtags
  * @global array $allowedentitynames
  *
- * @param string $context The context for which to retrieve tags.
- *                        Allowed values are post, strip, data,entities, or
- *                        the name of a field filter such as pre_user_description.
+ * @param string|array $context The context for which to retrieve tags.
+ *                              Allowed values are post, strip, data, entities, or
+ *                              the name of a field filter such as pre_user_description.
  * @return array List of allowed tags and their allowed attributes.
  */
 function wp_kses_allowed_html( $context = '' ) {
@@ -629,9 +629,8 @@ function wp_kses_allowed_html( $context = '' ) {
 		 *
 		 * @since 3.5.0
 		 *
-		 * @param string $tags    Allowed tags, attributes, and/or entities.
-		 * @param string $context Context to judge allowed tags by. Allowed values are 'post',
-		 *                        'data', 'strip', 'entities', 'explicit', or the name of a filter.
+		 * @param array  $context      Context to judge allowed tags by.
+		 * @param string $context_type Context type (explicit).
 		 */
 		return apply_filters( 'wp_kses_allowed_html', $context, 'explicit' );
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3f6ae91678..6195613ade 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40949';
+$wp_version = '4.9-alpha-40950';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.