Merged in feature/314-dev-dev01 (pull request #24)

auto-patch  314-dev-dev01-2024-01-25T04_09_02

* auto-patch  314-dev-dev01-2024-01-25T04_09_02
This commit is contained in:
Tony Volpe
2024-01-25 04:11:47 +00:00
parent 6b67473553
commit 68dbe860e9
540 changed files with 3445 additions and 2131 deletions

View File

@@ -182,6 +182,8 @@ class WPSEO_Option_Titles extends WPSEO_Option {
/**
* Make sure we can recognize the right action for the double cleaning.
*
* @return void
*/
public function end_of_init() {
do_action( 'wpseo_double_clean_titles' );
@@ -211,7 +213,7 @@ class WPSEO_Option_Titles extends WPSEO_Option {
/**
* Allow altering the array with separator options.
*
* @api array $separator_options Array with the separator options.
* @param array $separator_options Array with the separator options.
*/
$filtered_separators = apply_filters( 'wpseo_separator_options', $separators );
@@ -234,7 +236,7 @@ class WPSEO_Option_Titles extends WPSEO_Option {
$separator_options = [];
foreach ( $separators as $key => $label ) {
$aria_label = isset( $separator_list[ $key ]['label'] ) ? $separator_list[ $key ]['label'] : '';
$aria_label = ( $separator_list[ $key ]['label'] ?? '' );
$separator_options[ $key ] = [
'label' => $label,
@@ -640,7 +642,7 @@ class WPSEO_Option_Titles extends WPSEO_Option {
*
* Make sure when you filter this to also filter `wpseo_schema_article_types_labels`.
*
* @api array $schema_article_types The available schema article types.
* @param array $schema_article_types The available schema article types.
*/
if ( array_key_exists( $dirty[ $key ], apply_filters( 'wpseo_schema_article_types', Schema_Types::ARTICLE_TYPES ) ) ) {
$clean[ $key ] = $dirty[ $key ];
@@ -845,10 +847,8 @@ class WPSEO_Option_Titles extends WPSEO_Option {
if ( ! isset( $post_type_names[ $tax ] ) && isset( $option_value[ $old_prefix . $tax ] ) ) {
unset( $option_value[ $old_prefix . $tax ] );
}
else {
if ( isset( $post_type_names[ $tax ] ) && ! isset( $option_value[ $old_prefix . $tax ] ) ) {
$option_value[ $old_prefix . $tax ] = $original[ $old_prefix . $tax ];
}
elseif ( isset( $post_type_names[ $tax ] ) && ! isset( $option_value[ $old_prefix . $tax ] ) ) {
$option_value[ $old_prefix . $tax ] = $original[ $old_prefix . $tax ];
}
if ( $old_prefix === 'tax-hideeditbox-' ) {
@@ -929,7 +929,7 @@ class WPSEO_Option_Titles extends WPSEO_Option {
/**
* Allow altering the array with variable array key patterns.
*
* @api array $patterns Array with the variable array key patterns.
* @param array $patterns Array with the variable array key patterns.
*/
$patterns = apply_filters( 'wpseo_option_titles_variable_array_key_patterns', $patterns );
@@ -1020,7 +1020,7 @@ class WPSEO_Option_Titles extends WPSEO_Option {
/**
* Allows altering the separator options array.
*
* @api array $separators Array with the separator options.
* @param array $separators Array with the separator options.
*/
$separator_list = apply_filters( 'wpseo_separator_option_list', $separators );