From b2e442c247603273a6ec22a719f03907fbc8f5d9 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Tue, 5 May 2015 00:34:25 +0000 Subject: [PATCH] Add a missing `@return` tag and description to the DocBlock for `WP_Theme::scandir()`. Props lamosty. Fixes #31872. Built from https://develop.svn.wordpress.org/trunk@32345 git-svn-id: http://core.svn.wordpress.org/trunk@32316 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-theme.php | 2 ++ wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index 35fd7943e6..6e6c9981c1 100644 --- a/wp-includes/class-wp-theme.php +++ b/wp-includes/class-wp-theme.php @@ -998,6 +998,8 @@ final class WP_Theme implements ArrayAccess { * @param string $relative_path Optional. The basename of the absolute path. Used to control the * returned path for the found files, particularly when this function * recurses to lower depths. Default empty. + * @return array|false Array of files, keyed by the path to the file relative to the `$path` directory prepended + * with `$relative_path`, with the values being absolute paths. False otherwise. */ private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) { if ( ! is_dir( $path ) ) diff --git a/wp-includes/version.php b/wp-includes/version.php index 9dc0073290..1dc813d559 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32344'; +$wp_version = '4.3-alpha-32345'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.