Index: src/wp-includes/shortcodes.php
===================================================================
--- src/wp-includes/shortcodes.php	(revision 27194)
+++ src/wp-includes/shortcodes.php	(working copy)
@@ -286,14 +286,15 @@
 /**
  * Retrieve all attributes from the shortcodes tag.
  *
- * The attributes list has the attribute name as the key and the value of the
- * attribute as the value in the key/value pair. This allows for easier
- * retrieval of the attributes, since all attributes have to be known.
+ * Attributes are returned in key=value pairs as name=value, or index=value
+ * if no name is supplied. If no attributes are passed in the shortcode,
+ * an empty string will instead be returned.
  *
  * @since 2.5.0
  *
  * @param string $text
- * @return array List of attributes and their value.
+ * @return array|string Array of attributes and their values, empty string
+ *                      if no attributes were passed.
  */
 function shortcode_parse_atts($text) {
 	$atts = array();
@@ -307,7 +308,7 @@
 				$atts[strtolower($m[3])] = stripcslashes($m[4]);
 			elseif (!empty($m[5]))
 				$atts[strtolower($m[5])] = stripcslashes($m[6]);
-			elseif (isset($m[7]) and strlen($m[7]))
+			elseif (isset($m[7]) && strlen($m[7]))
 				$atts[] = stripcslashes($m[7]);
 			elseif (isset($m[8]))
 				$atts[] = stripcslashes($m[8]);