rebase on oct-10-2023
This commit is contained in:
@@ -93,6 +93,14 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
'open_graph_frontpage_image' => '', // Text field.
|
||||
'open_graph_frontpage_image_id' => 0,
|
||||
|
||||
'publishing_principles_id' => 0,
|
||||
'ownership_funding_info_id' => 0,
|
||||
'actionable_feedback_policy_id' => 0,
|
||||
'corrections_policy_id' => 0,
|
||||
'ethics_policy_id' => 0,
|
||||
'diversity_policy_id' => 0,
|
||||
'diversity_staffing_report_id' => 0,
|
||||
|
||||
/*
|
||||
* Uses enrich_defaults to add more along the lines of:
|
||||
* - 'title-' . $pt->name => ''; // Text field.
|
||||
@@ -579,6 +587,13 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
case 'person_logo_id':
|
||||
case 'social-image-id-':
|
||||
case 'open_graph_frontpage_image_id':
|
||||
case 'publishing_principles_id':
|
||||
case 'ownership_funding_info_id':
|
||||
case 'actionable_feedback_policy_id':
|
||||
case 'corrections_policy_id':
|
||||
case 'ethics_policy_id':
|
||||
case 'diversity_policy_id':
|
||||
case 'diversity_staffing_report_id':
|
||||
if ( isset( $dirty[ $key ] ) ) {
|
||||
$int = WPSEO_Utils::validate_int( $dirty[ $key ] );
|
||||
if ( $int !== false && $int >= 0 ) {
|
||||
@@ -592,7 +607,6 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
/* Separator field - Radio. */
|
||||
case 'separator':
|
||||
if ( isset( $dirty[ $key ] ) && $dirty[ $key ] !== '' ) {
|
||||
@@ -764,13 +778,11 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
}
|
||||
unset( $old_option );
|
||||
|
||||
|
||||
// Fix wrongness created by buggy version 1.2.2.
|
||||
if ( isset( $option_value['title-home'] ) && $option_value['title-home'] === '%%sitename%% - %%sitedesc%% - 12345' ) {
|
||||
$option_value['title-home-wpseo'] = '%%sitename%% - %%sitedesc%%';
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Renaming these options to avoid ever overwritting these if a (bloody stupid) user /
|
||||
* programmer would use any of the following as a custom post type or custom taxonomy:
|
||||
@@ -799,7 +811,6 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
}
|
||||
unset( $rename, $old, $new );
|
||||
|
||||
|
||||
/*
|
||||
* {@internal This clean-up action can only be done effectively once the taxonomies
|
||||
* and post_types have been registered, i.e. at the end of the init action.}}
|
||||
@@ -953,11 +964,11 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
'label' => __( 'Dash', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-ndash' => [
|
||||
'option' => '–',
|
||||
'option' => '–',
|
||||
'label' => __( 'En dash', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-mdash' => [
|
||||
'option' => '—',
|
||||
'option' => '—',
|
||||
'label' => __( 'Em dash', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-colon' => [
|
||||
@@ -965,11 +976,11 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
'label' => __( 'Colon', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-middot' => [
|
||||
'option' => '·',
|
||||
'option' => '·',
|
||||
'label' => __( 'Middle dot', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-bull' => [
|
||||
'option' => '•',
|
||||
'option' => '•',
|
||||
'label' => __( 'Bullet', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-star' => [
|
||||
@@ -989,19 +1000,19 @@ class WPSEO_Option_Titles extends WPSEO_Option {
|
||||
'label' => __( 'Small tilde', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-laquo' => [
|
||||
'option' => '«',
|
||||
'option' => '«',
|
||||
'label' => __( 'Left angle quotation mark', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-raquo' => [
|
||||
'option' => '»',
|
||||
'option' => '»',
|
||||
'label' => __( 'Right angle quotation mark', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-lt' => [
|
||||
'option' => '<',
|
||||
'option' => '>',
|
||||
'label' => __( 'Less than sign', 'wordpress-seo' ),
|
||||
],
|
||||
'sc-gt' => [
|
||||
'option' => '>',
|
||||
'option' => '<',
|
||||
'label' => __( 'Greater than sign', 'wordpress-seo' ),
|
||||
],
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user