From 82f244414ecb18ecd757d0a764a57405a5430f0c Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 1 Oct 2015 17:32:26 +0000
Subject: [PATCH] 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
---
 wp-includes/shortcodes.php | 5 ++++-
 wp-includes/version.php    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index e28e2b52f7..10b3e19a2e 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -443,7 +443,10 @@ function unescape_invalid_shortcodes( $content ) {
  * @since 2.5.0
  *
  * @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) {
 	$atts = array();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6b0c094f50..40323dc5cf 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.