From a8e2ae2117b9f96973d3bf974990353b20e7ff9d Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 19 Jan 2015 08:36:25 +0000
Subject: [PATCH] Ensure both parameters and the return for `has_shortcode()`
 are fully documented.

Props cais, SergeyBiryukov
See #31048.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/shortcodes.php | 6 ++++--
 wp-includes/version.php    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index f6855f542c..181aea048b 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -145,8 +145,10 @@ function shortcode_exists( $tag ) {
  * @since 3.6.0
  *
  * @global array $shortcode_tags
- * @param string $tag
- * @return boolean
+ *
+ * @param string $content Content to search for shortcodes.
+ * @param string $tag     Shortcode tag to check.
+ * @return bool Whether the passed content contains. the given shortcode.
  */
 function has_shortcode( $content, $tag ) {
 	if ( false === strpos( $content, '[' ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 04db1595de..25a30eb538 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31241';
+$wp_version = '4.2-alpha-31242';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.