From 0c1b765a6f7deb9725a61125aa8050ecffc37097 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Wed, 27 May 2015 22:04:26 +0000 Subject: [PATCH] Add missing doc blocks to `template.php`. See #32444. Built from https://develop.svn.wordpress.org/trunk@32628 git-svn-id: http://core.svn.wordpress.org/trunk@32598 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/template.php | 24 +++++++++++++++++++----- wp-includes/version.php | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/wp-includes/template.php b/wp-includes/template.php index e43ba321e5..64ff1ead5c 100644 --- a/wp-includes/template.php +++ b/wp-includes/template.php @@ -16,8 +16,8 @@ * * @since 1.5.0 * - * @param string $type Filename without extension. - * @param array $templates An optional list of template candidates + * @param string $type Filename without extension. + * @param array $templates An optional list of template candidates * @return string Full path to template file. */ function get_query_template( $type, $templates = array() ) { @@ -399,6 +399,8 @@ function get_single_template() { * * @see get_query_template() * + * @global array $posts + * * @return string Full path to attachment template file. */ function get_attachment_template() { @@ -455,8 +457,8 @@ function get_comments_popup_template() { * @since 2.7.0 * * @param string|array $template_names Template file(s) to search for, in order. - * @param bool $load If true the template file will be loaded if it is found. - * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false. + * @param bool $load If true the template file will be loaded if it is found. + * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false. * @return string The template filename if one is located. */ function locate_template($template_names, $load = false, $require_once = true ) { @@ -488,8 +490,20 @@ function locate_template($template_names, $load = false, $require_once = true ) * * @since 1.5.0 * + * @global array $posts + * @global WP_Post $post + * @global bool $wp_did_header + * @global WP_Query $wp_query + * @global WP_Rewrite $wp_rewrite + * @global wpdb $wpdb + * @global string $wp_version + * @global WP $wp + * @global int $id + * @global object $comment + * @global int $user_ID + * * @param string $_template_file Path to template file. - * @param bool $require_once Whether to require_once or require. Default true. + * @param bool $require_once Whether to require_once or require. Default true. */ function load_template( $_template_file, $require_once = true ) { global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID; diff --git a/wp-includes/version.php b/wp-includes/version.php index bc847fdbca..5504fd0531 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32627'; +$wp_version = '4.3-alpha-32628'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.