From 523b08600f49b9e8706bcdd35438d5d973062e50 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 15 Jun 2017 12:00:43 +0000
Subject: [PATCH] Database: Add documentation for the allowed `utf8mb4_520`
 value when detecting features with `wpdb::has_cap()`.

Props rcutmore

Fixes #41044

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


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

diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3bef174375..23c111c201 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40905';
+$wp_version = '4.9-alpha-40906';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 74dedd5130..2c9cceabf7 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -3268,7 +3268,7 @@ class wpdb {
 	 *
 	 * @param string $db_cap The feature to check for. Accepts 'collation',
 	 *                       'group_concat', 'subqueries', 'set_charset',
-	 *                       or 'utf8mb4'.
+	 *                       'utf8mb4', or 'utf8mb4_520'.
 	 * @return int|false Whether the database feature is supported, false otherwise.
 	 */
 	public function has_cap( $db_cap ) {