From 64cb8175279cf8fe47354ea192e6c34597fa370d Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Tue, 4 Jul 2017 17:16:42 +0000 Subject: [PATCH] Docs: Add a missing return notation and to the DocBlock for `WP_Session_Tokens::get_instance()`. Also adds an inline reference to the `session_token_manager` hook in the description. Props Shelob9 for the initial patch. Fixes #40102. Built from https://develop.svn.wordpress.org/trunk@40998 git-svn-id: http://core.svn.wordpress.org/trunk@40848 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-session-tokens.php | 7 ++++--- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-session-tokens.php b/wp-includes/class-wp-session-tokens.php index 1e381addf8..b1f90bfd5c 100644 --- a/wp-includes/class-wp-session-tokens.php +++ b/wp-includes/class-wp-session-tokens.php @@ -35,16 +35,17 @@ abstract class WP_Session_Tokens { } /** - * Get a session token manager instance for a user. + * Retrieves a session token manager instance for a user. * - * This method contains a filter that allows a plugin to swap out - * the session manager for a subclass of WP_Session_Tokens. + * This method contains a {@see 'session_token_manager'} filter, allowing a plugin to swap out + * the session manager for a subclass of `WP_Session_Tokens`. * * @since 4.0.0 * @access public * @static * * @param int $user_id User whose session to manage. + * @return WP_User_Meta_Session_Tokens WP_User_Meta_Session_Tokens class instance by default. */ final public static function get_instance( $user_id ) { /** diff --git a/wp-includes/version.php b/wp-includes/version.php index fe58a7901e..b95be9ae1a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-40997'; +$wp_version = '4.9-alpha-40998'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.