From bec5bcf717cdac73a4fa3a031b3ee0c5f56daa76 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 20 Aug 2015 18:26:26 +0000
Subject: [PATCH] Docs: Mark the `$notify` parameter in the DocBlock for
 `wp_new_user_notification()` as optional, and provide additional context on
 the difference between the accepted values.

See [33620] and [33023] for background.

See #32246.

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


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

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index c4eb8cc566..57be023165 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1691,8 +1691,9 @@ if ( !function_exists('wp_new_user_notification') ) :
  * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
  *
  * @param int    $user_id User ID.
- * @param string $notify  Whether admin and user should be notified ('both') or
- *                        only the admin ('admin' or empty).
+ * @param string $notify  Optional. Type of notification that should happen. Accepts 'admin' or an empty
+ *                        string (admin only), or 'both' (admin and user). The empty string value was kept
+ *                        for backward-compatibility purposes with the renamed parameter. Default empty.
  */
 function wp_new_user_notification( $user_id, $notify = '' ) {
 	global $wpdb;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d7c91b366b..63a3e83d04 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33663';
+$wp_version = '4.4-alpha-33664';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.