From 3a0726d7b8ef2e0644e44fffbfec69b35642666b Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 19 Jan 2015 08:40:24 +0000
Subject: [PATCH] Add more complete documentation for parameters, globals, and
 return values to the DocBlocks for `remove_shortcode()`,
 `shortcode_exists()`, and `do_shortcode()`.

Props SergeyBiryukov.
Fixes #31048.

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


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

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 181aea048b..ecefbe06ae 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -100,7 +100,7 @@ function add_shortcode($tag, $func) {
  *
  * @uses $shortcode_tags
  *
- * @param string $tag shortcode tag to remove hook for.
+ * @param string $tag Shortcode tag to remove hook for.
  */
 function remove_shortcode($tag) {
 	global $shortcode_tags;
@@ -130,9 +130,10 @@ function remove_all_shortcodes() {
  *
  * @since 3.6.0
  *
- * @global array $shortcode_tags
- * @param string $tag
- * @return boolean
+ * @global array $shortcode_tags List of shortcode tags and their callback hooks.
+ *
+ * @param string $tag Shortcode tag to check.
+ * @return bool Whether the given shortcode exists.
  */
 function shortcode_exists( $tag ) {
 	global $shortcode_tags;
@@ -180,9 +181,9 @@ function has_shortcode( $content, $tag ) {
  *
  * @since 2.5.0
  *
- * @uses $shortcode_tags
+ * @global array $shortcode_tags List of shortcode tags and their callback hooks.
  *
- * @param string $content Content to search for shortcodes
+ * @param string $content Content to search for shortcodes.
  * @return string Content with shortcodes filtered out.
  */
 function do_shortcode($content) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 25a30eb538..78df8ab3ea 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31242';
+$wp_version = '4.2-alpha-31243';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.