rebase on oct-10-2023

This commit is contained in:
Rachit Bhargava
2023-10-10 17:23:21 -04:00
parent d37566ffb6
commit d096058d7d
4789 changed files with 254611 additions and 307223 deletions

View File

@@ -15,7 +15,7 @@ if ( ! function_exists( 'add_filter' ) ) {
* {@internal Nobody should be able to overrule the real version number as this can cause
* serious issues with the options, so no if ( ! defined() ).}}
*/
define( 'WPSEO_VERSION', '20.8' );
define( 'WPSEO_VERSION', '21.3' );
if ( ! defined( 'WPSEO_PATH' ) ) {
@@ -35,8 +35,8 @@ define( 'YOAST_VENDOR_DEFINE_PREFIX', 'YOASTSEO_VENDOR__' );
define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );
define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
define( 'YOAST_SEO_WP_TESTED', '6.2.2' );
define( 'YOAST_SEO_WP_REQUIRED', '6.1' );
define( 'YOAST_SEO_WP_TESTED', '6.3.1' );
define( 'YOAST_SEO_WP_REQUIRED', '6.2' );
if ( ! defined( 'WPSEO_NAMESPACES' ) ) {
define( 'WPSEO_NAMESPACES', true );
@@ -80,6 +80,17 @@ elseif ( ! class_exists( 'WPSEO_Options' ) ) { // Still checking since might be
return;
}
/**
* Include the file from the `symfony/deprecation-contracts` dependency instead of autoloading it via composer.
*
* We need to do that because autoloading via composer prevents the vendor-prefixing of the dependency itself.
* Note that we don't expect the function to be ever called since the OAuth2 library should not provide invalid input.
*/
$deprecation_contracts_file = WPSEO_PATH . 'vendor_prefixed/symfony/deprecation-contracts/functions.php';
if ( is_readable( $deprecation_contracts_file ) ) {
include $deprecation_contracts_file;
}
if ( function_exists( 'spl_autoload_register' ) ) {
spl_autoload_register( 'wpseo_auto_load' );
}
@@ -218,7 +229,7 @@ function _wpseo_activate() {
WPSEO_Options::set( 'should_redirect_after_install_free', true );
}
else {
WPSEO_Options::set( 'activation_redirect_timestamp_free', \time() );
WPSEO_Options::set( 'activation_redirect_timestamp_free', time() );
}
// Reset tracking to be disabled by default.