Skip to content

Commit b9a587f

Browse files
committed
Merge branch 'trunk' of github.com:Yoast/wordpress-seo into feature/should-haves-for-inclusive-language
2 parents b3b3938 + bd34e30 commit b9a587f

150 files changed

Lines changed: 624 additions & 5935 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

admin/ajax.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -317,20 +317,3 @@ function wpseo_register_ajax_integrations() {
317317
new WPSEO_Shortcode_Filter();
318318

319319
new WPSEO_Taxonomy_Columns();
320-
321-
/* ********************* DEPRECATED FUNCTIONS ********************* */
322-
323-
/**
324-
* Hides the default tagline notice for a specific user.
325-
*
326-
* @deprecated 13.2
327-
* @codeCoverageIgnore
328-
*/
329-
function wpseo_dismiss_tagline_notice() {
330-
if ( ! current_user_can( 'manage_options' ) ) {
331-
die( '-1' );
332-
}
333-
334-
_deprecated_function( __FUNCTION__, 'WPSEO 13.2', 'This method is deprecated.' );
335-
wpseo_ajax_json_echo_die( '' );
336-
}

admin/class-admin-init.php

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -320,68 +320,4 @@ public function add_publish_box_section( $post ) {
320320
do_action( 'wpseo_publishbox_misc_actions', $post );
321321
}
322322
}
323-
324-
/* ********************* DEPRECATED METHODS ********************* */
325-
326-
/**
327-
* Notify about the default tagline if the user hasn't changed it.
328-
*
329-
* @deprecated 13.2
330-
* @codeCoverageIgnore
331-
*/
332-
public function tagline_notice() {
333-
_deprecated_function( __METHOD__, 'WPSEO 13.2' );
334-
}
335-
336-
/**
337-
* Returns whether or not the site has the default tagline.
338-
*
339-
* @deprecated 13.2
340-
* @codeCoverageIgnore
341-
*
342-
* @return bool
343-
*/
344-
public function has_default_tagline() {
345-
_deprecated_function( __METHOD__, 'WPSEO 13.2' );
346-
347-
$blog_description = get_bloginfo( 'description' );
348-
$default_blog_description = 'Just another WordPress site';
349-
350-
// We are using the WordPress internal translation.
351-
$translated_blog_description = __( 'Just another WordPress site', 'default' );
352-
353-
return $translated_blog_description === $blog_description || $default_blog_description === $blog_description;
354-
}
355-
356-
/**
357-
* Shows an alert when the permalink doesn't contain %postname%.
358-
*
359-
* @deprecated 13.2
360-
* @codeCoverageIgnore
361-
*/
362-
public function permalink_notice() {
363-
_deprecated_function( __METHOD__, 'WPSEO 13.2' );
364-
}
365-
366-
/**
367-
* Add an alert if the blog is not publicly visible.
368-
*
369-
* @deprecated 14.1
370-
* @codeCoverageIgnore
371-
*/
372-
public function blog_public_notice() {
373-
_deprecated_function( __METHOD__, 'WPSEO 14.1' );
374-
}
375-
376-
/**
377-
* Handles the notifiers for the dashboard page.
378-
*
379-
* @deprecated 14.1
380-
* @codeCoverageIgnore
381-
*
382-
* @return void
383-
*/
384-
public function handle_notifications() {
385-
_deprecated_function( __METHOD__, 'WPSEO 14.1' );
386-
}
387323
}

admin/class-gutenberg-compatibility.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
1515
*
1616
* @var string
1717
*/
18-
const CURRENT_RELEASE = '14.5.0';
18+
const CURRENT_RELEASE = '14.6.1';
1919

2020
/**
2121
* The minimally supported version of Gutenberg by the plugin.
2222
*
2323
* @var string
2424
*/
25-
const MINIMUM_SUPPORTED = '14.5.0';
25+
const MINIMUM_SUPPORTED = '14.6.1';
2626

2727
/**
2828
* Holds the current version.

admin/class-yoast-notifications.php

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,6 @@ public function enqueue_assets() {
108108
}
109109
}
110110

111-
/**
112-
* Deprecated: Handle ajax request to dismiss a alert.
113-
* Renamed to ajax_dismiss_notification
114-
*
115-
* @deprecated 14.0
116-
*
117-
* @codeCoverageIgnore
118-
*/
119-
public function ajax_dismiss_alert() {
120-
_deprecated_function( __METHOD__, 'WPSEO 14.0' );
121-
}
122-
123111
/**
124112
* Handle ajax request to dismiss a notification.
125113
*/
@@ -136,19 +124,6 @@ public function ajax_dismiss_notification() {
136124
wp_die();
137125
}
138126

139-
/**
140-
* Deprecated: Handle ajax request to restore a notification.
141-
* Renamed to ajax_restore_notification
142-
*
143-
* @deprecated 14.0
144-
* @codeCoverageIgnore
145-
*
146-
* @return void
147-
*/
148-
public function ajax_restore_alert() {
149-
_deprecated_function( __METHOD__, 'WPSEO 14.0' );
150-
}
151-
152127
/**
153128
* Handle ajax request to restore a notification.
154129
*/
@@ -277,20 +252,6 @@ public static function get_template_variables() {
277252
];
278253
}
279254

280-
/**
281-
* Deprecated: Get the number of active notifications.
282-
* Renamed to get_active_notification_count
283-
*
284-
* @deprecated 14.0
285-
* @codeCoverageIgnore
286-
*
287-
* @return int
288-
*/
289-
public function get_active_alert_count() {
290-
_deprecated_function( __METHOD__, 'WPSEO 14.0' );
291-
return 0;
292-
}
293-
294255
/**
295256
* Get the number of active notifications.
296257
*
@@ -301,20 +262,6 @@ public static function get_active_notification_count() {
301262
return ( count( self::$active_errors ) + count( self::$active_warnings ) );
302263
}
303264

304-
/**
305-
* Deprecated: Filter out any non-errors. Renamed to filter_error_notifications
306-
*
307-
* @deprecated 14.0
308-
* @codeCoverageIgnore
309-
*
310-
* @param Yoast_Notification $notification Notification to test.
311-
* @return bool
312-
*/
313-
public function filter_error_alerts( Yoast_Notification $notification ) {
314-
_deprecated_function( __METHOD__, 'WPSEO 14.0' );
315-
return false;
316-
}
317-
318265
/**
319266
* Filter out any non-errors.
320267
*
@@ -327,20 +274,6 @@ private static function filter_error_notifications( Yoast_Notification $notifica
327274
return $notification->get_type() === 'error';
328275
}
329276

330-
/**
331-
* Deprecated: Filter out any non-warnings. Renamed to filter_warning_notifications
332-
*
333-
* @deprecated 14.0
334-
* @codeCoverageIgnore
335-
*
336-
* @param Yoast_Notification $notification Notification to test.
337-
* @return bool
338-
*/
339-
public function filter_warning_alerts( Yoast_Notification $notification ) {
340-
_deprecated_function( __METHOD__, 'WPSEO 14.0' );
341-
return false;
342-
}
343-
344277
/**
345278
* Filter out any non-warnings.
346279
*
@@ -353,20 +286,6 @@ private static function filter_warning_notifications( Yoast_Notification $notifi
353286
return $notification->get_type() !== 'error';
354287
}
355288

356-
/**
357-
* Deprecated: Filter out any dismissed notifications. Renamed to filter_dismissed_alerts.
358-
*
359-
* @deprecated 14.0
360-
* @codeCoverageIgnore
361-
*
362-
* @param Yoast_Notification $notification Notification to test.
363-
* @return bool
364-
*/
365-
public function filter_dismissed_alerts( Yoast_Notification $notification ) {
366-
_deprecated_function( __METHOD__, 'WPSEO 14.0' );
367-
return false;
368-
}
369-
370289
/**
371290
* Filter out any dismissed notifications.
372291
*

admin/class-yoast-plugin-conflict.php

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -111,41 +111,6 @@ public function check_for_conflicts( $plugin_section ) {
111111
return false;
112112
}
113113

114-
/**
115-
* Getting all the conflicting plugins and return them as a string.
116-
*
117-
* This method will loop through all conflicting plugins to get the details of each plugin. The plugin name
118-
* will be taken from the details to parse a comma separated string, which can be use for by example a notice
119-
*
120-
* @deprecated 17.7 This method is unused and will be removed in the future
121-
* @codeCoverageIgnore
122-
*
123-
* @param string $plugin_section Plugin conflict type (such as Open Graph or sitemap).
124-
*
125-
* @return string
126-
*/
127-
public function get_conflicting_plugins_as_string( $plugin_section ) {
128-
if ( ! \function_exists( 'get_plugin_data' ) ) {
129-
require_once ABSPATH . 'wp-admin/includes/plugin.php';
130-
}
131-
132-
// Getting the active plugins by given section.
133-
$plugins = $this->active_conflicting_plugins[ $plugin_section ];
134-
135-
$plugin_names = [];
136-
foreach ( $plugins as $plugin ) {
137-
$name = $this->get_plugin_name( $plugin );
138-
if ( ! empty( $name ) ) {
139-
$plugin_names[] = '<em>' . $name . '</em>';
140-
}
141-
}
142-
unset( $plugins, $plugin );
143-
144-
if ( ! empty( $plugin_names ) ) {
145-
return \implode( ' &amp; ', $plugin_names );
146-
}
147-
}
148-
149114
/**
150115
* Checks for given $plugin_sections for conflicts.
151116
*

admin/formatter/class-metabox-formatter.php

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -321,44 +321,4 @@ private function multilingual_plugin_active() {
321321

322322
return ( $wpml_active || $polylang_active || $translatepress_active );
323323
}
324-
325-
/* ********************* DEPRECATED METHODS ********************* */
326-
327-
/**
328-
* Returns the translations for the Add Keyword modal.
329-
*
330-
* These strings are not escaped because they're meant to be used with React
331-
* which already takes care of that. If used in PHP, they should be escaped.
332-
*
333-
* @deprecated 15.5
334-
* @codeCoverageIgnore
335-
*
336-
* @return array Translated text strings for the Add Keyword modal.
337-
*/
338-
public function get_add_keyword_upsell_translations() {
339-
_deprecated_function( __METHOD__, 'WPSEO 15.5' );
340-
341-
return [
342-
'title' => __( 'Would you like to add more than one keyphrase?', 'wordpress-seo' ),
343-
'intro' => sprintf(
344-
/* translators: %s expands to a 'Yoast SEO Premium' text linked to the yoast.com website. */
345-
__( 'Great news: you can, with %s!', 'wordpress-seo' ),
346-
'{{link}}Yoast SEO Premium{{/link}}'
347-
),
348-
'link' => WPSEO_Shortlinker::get( 'https://yoa.st/pe-premium-page' ),
349-
'other' => sprintf(
350-
/* translators: %s expands to 'Yoast SEO Premium'. */
351-
__( 'Other benefits of %s for you:', 'wordpress-seo' ),
352-
'Yoast SEO Premium'
353-
),
354-
'buylink' => WPSEO_Shortlinker::get( 'https://yoa.st/add-keywords-popup' ),
355-
'buy' => sprintf(
356-
/* translators: %s expands to 'Yoast SEO Premium'. */
357-
__( 'Get %s', 'wordpress-seo' ),
358-
'Yoast SEO Premium'
359-
),
360-
'small' => __( '1 year free support and updates included!', 'wordpress-seo' ),
361-
'a11yNotice.opensInNewTab' => __( '(Opens in a new browser tab)', 'wordpress-seo' ),
362-
];
363-
}
364324
}

admin/views/licenses.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292
$extensions['yoast-seo-plugin-subscription'] = [
9393
'buyUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/premium-page-bundle-buy' ),
9494
'infoUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/premium-page-bundle-info' ),
95-
'title' => 'all Yoast plugins',
95+
/* translators: used in phrases such as "More information about all the Yoast plugins" */
96+
'title' => __( 'all the Yoast plugins', 'wordpress-seo' ),
9697
'display_title' => __( 'Cover all your SEO bases', 'wordpress-seo' ),
9798
'desc' => '',
9899
'image' => plugins_url( 'images/plugin_subscription.svg?v=' . WPSEO_VERSION, WPSEO_FILE ),
@@ -104,7 +105,8 @@
104105
__( 'Drive more traffic to your online store', 'wordpress-seo' ),
105106

106107
],
107-
'buy_button' => 'all Yoast plugins',
108+
/* translators: used in phrases such as "Buy all the Yoast plugins" */
109+
'buy_button' => __( 'all the Yoast plugins', 'wordpress-seo' ),
108110
];
109111

110112
$addon_manager = new WPSEO_Addon_Manager();
@@ -310,7 +312,7 @@
310312
<a target="_blank" class="yoast-button-upsell" href="<?php echo esc_url( $extension['buyUrl'] ); ?>">
311313
<?php
312314
printf(
313-
/* translators: %s expands to the product name, e.g. "News SEO" or "all Yoast Plugins" */
315+
/* translators: %s expands to the product name, e.g. "News SEO" or "all the Yoast Plugins" */
314316
esc_html__( 'Buy %s', 'wordpress-seo' ),
315317
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: The possible `get_buy_button` values are hardcoded (buy_button or title); only passed through the WPSEO_Extensions class.
316318
( isset( $extension['buy_button'] ) ) ? $extension['buy_button'] : $extension['title']
@@ -324,7 +326,7 @@
324326
<a target="_blank" class="yoast-link--more-info" href="<?php echo esc_url( $extension['infoUrl'] ); ?>">
325327
<?php
326328
printf(
327-
/* translators: Text between 1: and 2: will only be shown to screen readers. 3: expands to the product name, e.g. "News SEO" or "all Yoast Plugins" */
329+
/* translators: Text between 1: and 2: will only be shown to screen readers. 3: expands to the product name, e.g. "News SEO" or "all the Yoast Plugins" */
328330
esc_html__( 'More information %1$sabout %3$s%2$s', 'wordpress-seo' ),
329331
'<span class="screen-reader-text">',
330332
'</span>',

admin/views/tabs/metas/paper-content/post-type-content.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,3 @@
121121
'This action is going away with no replacement. If you want to add settings that interact with Yoast SEO, please create your own settings page.'
122122
);
123123
}
124-
125-
/**
126-
* Allow adding a custom checkboxes to the admin meta page - Post Types tab.
127-
*
128-
* @deprecated 16.3 Use the {@see 'Yoast\WP\SEO\admin_post_types_beforearchive'} action instead.
129-
*
130-
* @param Yoast_Form $yform The Yoast_Form object.
131-
* @param string $name The post type name.
132-
*/
133-
do_action_deprecated(
134-
'wpseo_admin_page_meta_post_types',
135-
[ $yform, $wpseo_post_type->name ],
136-
'16.3',
137-
'Yoast\WP\SEO\admin_post_types_beforearchive'
138-
);

admin/views/tabs/metas/paper-content/taxonomy-content.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,3 @@
8383
'',
8484
'This action is going away with no replacement. If you want to add settings that interact with Yoast SEO, please create your own settings page.'
8585
);
86-
87-
/**
88-
* Allow adding custom checkboxes to the admin meta page - Taxonomies tab.
89-
*
90-
* @deprecated 16.3 Use {@see 'Yoast\WP\SEO\admin_taxonomies_meta'} instead.
91-
*
92-
* @param Yoast_Form $yform The Yoast_Form object.
93-
* @param WP_Taxonomy $wpseo_taxonomy The taxonomy.
94-
*/
95-
do_action_deprecated(
96-
'wpseo_admin_page_meta_taxonomies',
97-
[ $yform, $wpseo_taxonomy ],
98-
'16.3',
99-
'Yoast\WP\SEO\admin_taxonomies_meta'
100-
);

0 commit comments

Comments
 (0)