From 6ccba88ea5053b82c235c2a070f0648cbfa0a658 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 4 Apr 2015 21:35:25 +0000
Subject: [PATCH] Add proper descriptions for the `@global` and `@param` tags
 in the `wp_media_attach_action()` DocBlock.

See [31619]. See #31888.

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


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

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index e569040138..75811962f9 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -3027,9 +3027,11 @@ function wp_read_audio_metadata( $file ) {
  *
  * @since 4.2.0
  *
- * @global wpdb $wpdb
- * @param int    $parent_id
- * @param string $action
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int    $parent_id Attachment parent ID.
+ * @param string $action    Optional. Attach/detach action. Accepts 'attach' or 'detach'.
+ *                          Default 'attach'.
  */
 function wp_media_attach_action( $parent_id, $action = 'attach' ) {
 	global $wpdb;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e25ef072e2..cdaf0c087f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32017';
+$wp_version = '4.2-beta4-32018';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.