From 65cdec186bc58b25258625f9db8e4a1c90aeb985 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Fri, 21 Oct 2022 21:51:14 +0000 Subject: [PATCH] Docs: Align spelling with American English. This changeset replaces "cancelled" with "canceled" in various docblocks, per the [https://make.wordpress.org/core/handbook/best-practices/spelling/ Spelling Guidelines]. Props costdev. See #56811, #56792. Built from https://develop.svn.wordpress.org/trunk@54664 git-svn-id: http://core.svn.wordpress.org/trunk@54216 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pluggable.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index c2a975d896..2852e23a93 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1361,7 +1361,7 @@ if ( ! function_exists( 'wp_redirect' ) ) : * @param string $location The path or URL to redirect to. * @param int $status Optional. HTTP response status code to use. Default '302' (Moved Temporarily). * @param string $x_redirect_by Optional. The application doing the redirect. Default 'WordPress'. - * @return bool False if the redirect was cancelled, true otherwise. + * @return bool False if the redirect was canceled, true otherwise. */ function wp_redirect( $location, $status = 302, $x_redirect_by = 'WordPress' ) { global $is_IIS; @@ -1504,7 +1504,7 @@ if ( ! function_exists( 'wp_safe_redirect' ) ) : * @param string $location The path or URL to redirect to. * @param int $status Optional. HTTP response status code to use. Default '302' (Moved Temporarily). * @param string $x_redirect_by Optional. The application doing the redirect. Default 'WordPress'. - * @return bool False if the redirect was cancelled, true otherwise. + * @return bool False if the redirect was canceled, true otherwise. */ function wp_safe_redirect( $location, $status = 302, $x_redirect_by = 'WordPress' ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 7f4d943991..fe969cfe82 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54663'; +$wp_version = '6.2-alpha-54664'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.