From 5c291d49de756db1dbfddfe3fd69709595800622 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Sun, 18 Mar 2018 14:23:33 +0000 Subject: [PATCH] Pinking shears. See #41057. Built from https://develop.svn.wordpress.org/trunk@42843 git-svn-id: http://core.svn.wordpress.org/trunk@42673 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 18 ++-- wp-includes/admin-bar.php | 6 +- wp-includes/author-template.php | 6 +- wp-includes/category-template.php | 8 +- wp-includes/class-wp-query.php | 2 +- wp-includes/comment-template.php | 10 +- wp-includes/functions.wp-scripts.php | 6 +- wp-includes/general-template.php | 4 +- wp-includes/l10n.php | 6 +- wp-includes/load.php | 4 +- wp-includes/pluggable.php | 4 +- wp-includes/post-template.php | 10 +- wp-includes/post-thumbnail-template.php | 4 +- wp-includes/query.php | 138 ++++++++++++------------ wp-includes/taxonomy.php | 12 +-- wp-includes/version.php | 2 +- wp-includes/widgets.php | 18 ++-- wp-login.php | 14 +-- 18 files changed, 136 insertions(+), 136 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index d2ed56d76b..375bb728e8 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -463,11 +463,11 @@ function _get_dropins() { * * Plugins in the mu-plugins/ folder can't be "activated," so this function will * return false for those plugins. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.5.0 * * @param string $plugin Path to the plugin file relative to the plugins directory. @@ -481,11 +481,11 @@ function is_plugin_active( $plugin ) { * Determines whether the plugin is inactive. * * Reverse of is_plugin_active(). Used as a callback. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 3.1.0 * @see is_plugin_active() * @@ -503,11 +503,11 @@ function is_plugin_inactive( $plugin ) { * * Plugins in the mu-plugins/ folder can't be "activated," so this function will * return false for those plugins. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 3.0.0 * * @param string $plugin Path to the plugin file relative to the plugins directory. diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 99126c6c7f..c21916e4f9 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -1118,11 +1118,11 @@ function show_admin_bar( $show ) { /** * Determines whether the admin bar should be showing. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 3.1.0 * * @global bool $show_admin_bar diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index c1681a3139..9ef4dac0c6 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -524,11 +524,11 @@ function wp_list_authors( $args = '' ) { * Determines whether this site has more than one author. * * Checks to see if more than one author has published posts. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 3.2.0 * * @global wpdb $wpdb WordPress database abstraction object. diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 429fcb86eb..e581517330 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -231,9 +231,9 @@ function get_the_category_list( $separator = '', $parents = '', $post_id = false * Prior to v2.7, only one category could be compared: in_category( $single_category ). * Prior to v2.7, this function could only be used in the WordPress Loop. * As of 2.7, the function can be used anywhere if it is provided a post ID or post object. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 1.2.0 @@ -1419,9 +1419,9 @@ function has_category( $category = '', $post = null ) { * Prior to v2.7 of WordPress, tags given as integers would also be checked against the post's tags' names and slugs (in addition to term_ids) * Prior to v2.7, this function could only be used in the WordPress Loop. * As of 2.7, the function can be used anywhere if it is provided a post ID or post object. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.6.0 diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index b65ac1c41e..746399f7fd 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -3163,7 +3163,7 @@ class WP_Query { if ( is_array( $this->posts ) ) { $this->found_posts = count( $this->posts ); } else { - if ( null === $this->posts ) { + if ( null === $this->posts ) { $this->found_posts = 0; } else { $this->found_posts = 1; diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index ed533c3311..d2772f23fb 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -1202,11 +1202,11 @@ function trackback_rdf( $deprecated = '' ) { /** * Determines whether the current post is open for comments. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post. @@ -1232,9 +1232,9 @@ function comments_open( $post_id = null ) { /** * Determines whether the current post is open for pings. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 1.5.0 diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php index 39ab60bcc7..765fe92ad4 100644 --- a/wp-includes/functions.wp-scripts.php +++ b/wp-includes/functions.wp-scripts.php @@ -320,11 +320,11 @@ function wp_dequeue_script( $handle ) { /** * Determines whether a script has been added to the queue. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.8.0 * @since 3.5.0 'enqueued' added as an alias of the 'queue' list. * diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 849c23eb3b..b8f90b85bb 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -3960,10 +3960,10 @@ function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = arra /** * Registers the default admin color schemes. - * + * * Registers the initial set of eight color schemes in the Profile section * of the dashboard which allows for styling the admin menu and toolbar. - * + * * @see wp_admin_css_color() * * @since 3.0.0 diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 51f701f01e..ff6ebbc65c 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -917,7 +917,7 @@ function _get_path_to_translation( $domain, $reset = false ) { * @access private * * @see _get_path_to_translation() - * @staticvar array $cached_mofiles + * @staticvar array $cached_mofiles * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return string|false The path to the translation file or false if no translation file was found. @@ -1288,9 +1288,9 @@ function wp_dropdown_languages( $args = array() ) { /** * Determines whether the current locale is right-to-left (RTL). - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 3.0.0 diff --git a/wp-includes/load.php b/wp-includes/load.php index b14067c3ee..52245dfd92 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -774,8 +774,8 @@ function wp_clone( $object ) { * for checking roles and capabilities. * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ - * Conditional Tags} article in the Theme Developer Handbook. + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * Conditional Tags} article in the Theme Developer Handbook. * * @since 1.5.1 * diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 1e5fc5acab..9936858ef7 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -984,9 +984,9 @@ if ( ! function_exists( 'is_user_logged_in' ) ) : * Determines whether the current visitor is a logged in user. * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.0.0 * * @return bool True if user is logged in, false if not logged in. diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 9bbfd764b0..9cf6c44551 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -413,9 +413,9 @@ function get_the_excerpt( $post = null ) { /** * Determines whether the post has a custom excerpt. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.3.0 @@ -1698,11 +1698,11 @@ function get_the_password_form( $post = 0 ) { * This template tag allows you to determine if you are in a page template. * You can optionally provide a template name or array of template names * and then the check will be specific to that template. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.5.0 * @since 4.2.0 The `$template` parameter was changed to also accept an array of page templates. * @since 4.7.0 Now works with any post type, not just pages. diff --git a/wp-includes/post-thumbnail-template.php b/wp-includes/post-thumbnail-template.php index 6cdbf4e2e8..c20e2df1aa 100644 --- a/wp-includes/post-thumbnail-template.php +++ b/wp-includes/post-thumbnail-template.php @@ -11,9 +11,9 @@ /** * Determines whether a post has an image attached. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.9.0 diff --git a/wp-includes/query.php b/wp-includes/query.php index 5c61004c09..ced8e40548 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -139,11 +139,11 @@ function wp_reset_postdata() { * Determines whether the query is for an existing archive page. * * Month, Year, Category, Author, Post Type archive... - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -163,11 +163,11 @@ function is_archive() { /** * Determines whether the query is for an existing post type archive page. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 3.1.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -188,11 +188,11 @@ function is_post_type_archive( $post_types = '' ) { /** * Determines whether the query is for an existing attachment page. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.0.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -216,11 +216,11 @@ function is_attachment( $attachment = '' ) { * * If the $author parameter is specified, this function will additionally * check if the query is for one of the authors specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -244,11 +244,11 @@ function is_author( $author = '' ) { * * If the $category parameter is specified, this function will additionally * check if the query is for one of the categories specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -272,9 +272,9 @@ function is_category( $category = '' ) { * * If the $tag parameter is specified, this function will additionally * check if the query is for one of the tags specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.3.0 @@ -304,9 +304,9 @@ function is_tag( $tag = '' ) { * If the $term parameter is specified in addition to the $taxonomy parameter, * this function will additionally check if the query is for one of the terms * specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.5.0 @@ -330,11 +330,11 @@ function is_tax( $taxonomy = '', $term = '' ) { /** * Determines whether the query is for an existing date archive. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -356,11 +356,11 @@ function is_date() { * Determines whether the query is for an existing day archive. * * A conditional check to test whether the page is a date-based archive page displaying posts for the current day. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -380,11 +380,11 @@ function is_day() { /** * Determines whether the query is for a feed. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -434,11 +434,11 @@ function is_comment_feed() { * true when viewing that page. * * Otherwise the same as @see is_home() - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -466,11 +466,11 @@ function is_front_page() { * * If a static page is set for the front page of the site, this function will return true only * on the page you set as the "Posts page". - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @see is_front_page() @@ -491,11 +491,11 @@ function is_home() { /** * Determines whether the query is for an existing month archive. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -518,11 +518,11 @@ function is_month() { * * If the $page parameter is specified, this function will additionally * check if the query is for one of the pages specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @see is_single() * @see is_singular() * @@ -546,11 +546,11 @@ function is_page( $page = '' ) { /** * Determines whether the query is for paged results and not for the first page. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -570,11 +570,11 @@ function is_paged() { /** * Determines whether the query is for a post or page preview. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.0.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -614,11 +614,11 @@ function is_robots() { /** * Determines whether the query is for a search. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -643,11 +643,11 @@ function is_search() { * * If the $post parameter is specified, this function will additionally * check if the query is for one of the Posts specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @see is_page() * @see is_singular() * @@ -675,11 +675,11 @@ function is_single( $post = '' ) { * * If the $post_types parameter is specified, this function will additionally * check if the query is for one of the Posts Types specified. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @see is_page() * @see is_single() * @@ -703,9 +703,9 @@ function is_singular( $post_types = '' ) { /** * Determines whether the query is for a specific time. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 1.5.0 @@ -727,9 +727,9 @@ function is_time() { /** * Determines whether the query is for a trackback endpoint call. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 1.5.0 @@ -751,9 +751,9 @@ function is_trackback() { /** * Determines whether the query is for an existing year archive. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 1.5.0 @@ -775,11 +775,11 @@ function is_year() { /** * Determines whether the query has resulted in a 404 (returns no results). - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 1.5.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -819,11 +819,11 @@ function is_embed() { /** * Determines whether the query is the main query. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 3.3.0 * * @global WP_Query $wp_query Global WP_Query instance. @@ -867,9 +867,9 @@ function have_posts() { /** * Determines whether the caller is in the Loop. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.0.0 diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index a189fddd15..23a274f1ca 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -262,9 +262,9 @@ function get_taxonomy( $taxonomy ) { * Determines whether the taxonomy name exists. * * Formerly is_taxonomy(), introduced in 2.3.0. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 3.0.0 @@ -287,9 +287,9 @@ function taxonomy_exists( $taxonomy ) { * object, and finally returns the hierarchical value in the object. * * A false return value might also mean that the taxonomy does not exist. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 2.3.0 @@ -1326,9 +1326,9 @@ function has_term_meta( $term_id ) { * Determines whether a term exists. * * Formerly is_term(), introduced in 2.3.0. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * * @since 3.0.0 diff --git a/wp-includes/version.php b/wp-includes/version.php index 76c53b2dec..7127f2a1ed 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42841'; +$wp_version = '5.0-alpha-42843'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index be1bd5b406..dc6ce99322 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -812,11 +812,11 @@ function dynamic_sidebar( $index = 1 ) { * * NOTE: $widget_id and $id_base are the same for single widgets. To be effective * this function has to run after widgets have initialized, at action {@see 'init'} or later. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.2.0 * * @global array $wp_registered_widgets @@ -854,11 +854,11 @@ function is_active_widget( $callback = false, $widget_id = false, $id_base = fal /** * Determines whether the dynamic sidebar is enabled and used by the theme. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.2.0 * * @global array $wp_registered_widgets @@ -883,11 +883,11 @@ function is_dynamic_sidebar() { /** * Determines whether a sidebar is in use. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 2.8.0 * * @param string|int $index Sidebar name, id or number to check. diff --git a/wp-login.php b/wp-login.php index d176821534..93d08181ee 100644 --- a/wp-login.php +++ b/wp-login.php @@ -871,25 +871,25 @@ switch ( $action ) { if ( is_wp_error( $result ) ) { /** * Fires an action hook when the account action was not confirmed. - * + * * After running this action hook the page will die. - * + * * @param WP_Error $result Error object. */ do_action( 'account_action_failed', $result ); wp_die( $result ); } - + /** * Fires an action hook when the account action has been confirmed by the user. - * + * * Using this you can assume the user has agreed to perform the action by * clicking on the link in the confirmation email. - * - * After firing this action hook the page will redirect to wp-login a callback + * + * After firing this action hook the page will redirect to wp-login a callback * redirects or exits first. - * + * * @param array $result { * Data about the action which was confirmed. *