From e4da863a6fe6826acf3d04cf99481988246fed44 Mon Sep 17 00:00:00 2001
From: gziolo <gziolo@git.wordpress.org>
Date: Thu, 4 Nov 2021 16:03:57 +0000
Subject: [PATCH] Docs: Clarify the path usage
 register_block_type_from_metadata

The filename passed with the first param must end with `block.json`.

Fixes #53806.
Props coreyw, costdev.


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


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

diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php
index 72330aa578..97c292d875 100644
--- a/wp-includes/blocks.php
+++ b/wp-includes/blocks.php
@@ -213,6 +213,7 @@ function get_block_metadata_i18n_schema() {
  *
  * @param string $file_or_folder Path to the JSON file with metadata definition for
  *                               the block or path to the folder where the `block.json` file is located.
+ *                               If providing the path to a JSON file, the filename must end with `block.json`.
  * @param array  $args           Optional. Array of block type arguments. Accepts any public property
  *                               of `WP_Block_Type`. See WP_Block_Type::__construct() for information
  *                               on accepted arguments. Default empty array.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4fa87398eb..7592d18562 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52011';
+$wp_version = '5.9-alpha-52012';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.