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

Shortcodes: clarify the `@return` docs for `shortcode_parse_atts()`. 

Props miqrogroove.
See #23307.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-01 17:32:26 +00:00
parent 0acededa82
commit 82f244414e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/shortcodes.php
View File

@ -443,7 +443,10 @@ function unescape_invalid_shortcodes( $content ) {
* @since 2.5.0 * @since 2.5.0
* *
* @param string $text * @param string $text
* @return array List of attributes and their value. * @return array|string List of attribute values.
* Returns empty array if trim( $text ) == '""'.
* Returns empty string if trim( $text ) == ''.
* All other matches are checked for not empty().
*/ */
function shortcode_parse_atts($text) { function shortcode_parse_atts($text) {
$atts = array(); $atts = array();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34743'; $wp_version = '4.4-alpha-34744';
/** /**
* 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.