WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: Add a missing changelog entry for the point where the `$tagnames` parameter was added to `get_shortcode_regex()`. 

Props keesiemeijer.
Fixes #38914.

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


git-svn-id: http://core.svn.wordpress.org/trunk@39291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-11-23 17:35:32 +00:00
parent 456941a018
commit a7ddf24f3d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/shortcodes.php
View File

@ -244,10 +244,11 @@ function do_shortcode( $content, $ignore_html = false ) {
* 6 - An extra ] to allow for escaping shortcodes with double [[]] * 6 - An extra ] to allow for escaping shortcodes with double [[]]
* *
* @since 2.5.0 * @since 2.5.0
* @since 4.4.0 Added the `$tagnames` parameter.
* *
* @global array $shortcode_tags * @global array $shortcode_tags
* *
* @param array $tagnames List of shortcodes to find. Optional. Defaults to all registered shortcodes. * @param array $tagnames Optional. List of shortcodes to find. Defaults to all registered shortcodes.
* @return string The shortcode search regular expression * @return string The shortcode search regular expression
*/ */
function get_shortcode_regex( $tagnames = null ) { function get_shortcode_regex( $tagnames = null ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-beta4-39350'; $wp_version = '4.7-beta4-39351';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.