plugin updates
This commit is contained in:
Tony Volpe
@@ -313,6 +313,9 @@ class WPSEO_Admin_Asset_Manager {
|
||||
self::PREFIX . 'externals-contexts',
|
||||
self::PREFIX . 'externals-redux',
|
||||
],
|
||||
'new-dashboard' => [
|
||||
self::PREFIX . 'api-client',
|
||||
],
|
||||
];
|
||||
|
||||
$plugin_scripts = $this->load_generated_asset_file(
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
* @package WPSEO\Admin
|
||||
*/
|
||||
|
||||
use Yoast\WP\SEO\Conditionals\New_Dashboard_Ui_Conditional;
|
||||
use Yoast\WP\SEO\Integrations\Settings_Integration;
|
||||
|
||||
/**
|
||||
@@ -241,7 +242,8 @@ class WPSEO_Admin {
|
||||
$configuration_title = ( ! $first_time_configuration_notice_helper->should_show_alternate_message() ) ? 'first-time configuration' : 'SEO configuration';
|
||||
/* translators: CTA to finish the first time configuration. %s: Either first-time SEO configuration or SEO configuration. */
|
||||
$message = sprintf( __( 'Finish your %s', 'wordpress-seo' ), $configuration_title );
|
||||
$ftc_link = '<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_dashboard#top#first-time-configuration' ) ) . '" target="_blank">' . $message . '</a>';
|
||||
$ftc_page = ( ( new New_Dashboard_Ui_Conditional() )->is_met() ) ? 'admin.php?page=wpseo_dashboard#/first-time-configuration' : 'admin.php?page=wpseo_dashboard#top#first-time-configuration';
|
||||
$ftc_link = '<a href="' . esc_url( admin_url( $ftc_page ) ) . '" target="_blank">' . $message . '</a>';
|
||||
array_unshift( $links, $ftc_link );
|
||||
}
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public const CURRENT_RELEASE = '19.3.0';
|
||||
public const CURRENT_RELEASE = '19.4.0';
|
||||
|
||||
/**
|
||||
* The minimally supported version of Gutenberg by the plugin.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public const MINIMUM_SUPPORTED = '19.3.0';
|
||||
public const MINIMUM_SUPPORTED = '19.4.0';
|
||||
|
||||
/**
|
||||
* Holds the current version.
|
||||
|
||||
@@ -600,6 +600,12 @@ class Yoast_Notification_Center {
|
||||
* @return void
|
||||
*/
|
||||
public function update_storage() {
|
||||
/**
|
||||
* Plugins might exit on the plugins_loaded hook.
|
||||
* This prevents the pluggable.php file from loading, as it's loaded after the plugins_loaded hook.
|
||||
* As we need functions defined in pluggable.php, make sure it's loaded.
|
||||
*/
|
||||
require_once ABSPATH . WPINC . '/pluggable.php';
|
||||
|
||||
$notifications = $this->notifications;
|
||||
|
||||
|
||||
@@ -355,6 +355,15 @@ class Yoast_Notification {
|
||||
return '<div ' . implode( ' ', $attributes ) . '>' . $message . '</div>' . PHP_EOL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the message for the notification.
|
||||
*
|
||||
* @return string The message.
|
||||
*/
|
||||
public function get_message() {
|
||||
return wpautop( $this->message );
|
||||
}
|
||||
|
||||
/**
|
||||
* Wraps the message with a Yoast SEO icon.
|
||||
*
|
||||
|
||||
@@ -879,6 +879,10 @@ class WPSEO_Metabox extends WPSEO_Meta {
|
||||
'log_level' => WPSEO_Utils::get_analysis_worker_log_level(),
|
||||
];
|
||||
|
||||
$page_on_front = (int) get_option( 'page_on_front' );
|
||||
$homepage_is_page = get_option( 'show_on_front' ) === 'page';
|
||||
$is_front_page = $homepage_is_page && $page_on_front === (int) $post_id;
|
||||
|
||||
$script_data = [
|
||||
'metabox' => $this->get_metabox_script_data(),
|
||||
'isPost' => true,
|
||||
@@ -891,6 +895,7 @@ class WPSEO_Metabox extends WPSEO_Meta {
|
||||
'plugins' => $plugins_script_data,
|
||||
'worker' => $worker_script_data,
|
||||
],
|
||||
'isFrontPage' => $is_front_page,
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
* @package WPSEO\Admin\Views
|
||||
*/
|
||||
|
||||
use Yoast\WP\SEO\Conditionals\New_Dashboard_Ui_Conditional;
|
||||
|
||||
if ( ! defined( 'WPSEO_VERSION' ) ) {
|
||||
header( 'Status: 403 Forbidden' );
|
||||
header( 'HTTP/1.1 403 Forbidden' );
|
||||
@@ -100,10 +102,11 @@ function wpseo_import_external_select( $name, $plugins ) {
|
||||
<h3><?php esc_html_e( 'Step 4: Go through the first time configuration', 'wordpress-seo' ); ?></h3>
|
||||
<p>
|
||||
<?php
|
||||
$ftc_page = ( ( new New_Dashboard_Ui_Conditional() )->is_met() ) ? 'admin.php?page=wpseo_dashboard#/first-time-configuration' : 'admin.php?page=wpseo_dashboard#top#first-time-configuration';
|
||||
printf(
|
||||
/* translators: 1: Link start tag to the First time configuration tab in the General page, 2: Link closing tag. */
|
||||
esc_html__( 'You should finish the %1$sfirst time configuration%2$s to make sure your SEO data has been optimized and you’ve set the essential Yoast SEO settings for your site.', 'wordpress-seo' ),
|
||||
'<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_dashboard#top#first-time-configuration' ) ) . '">',
|
||||
'<a href="' . esc_url( admin_url( $ftc_page ) ) . '">',
|
||||
'</a>'
|
||||
);
|
||||
?>
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
||||
body.toplevel_page_wpseo_dashboard{--tw-bg-opacity:1;background-color:rgb(241 245 249/var(--tw-bg-opacity));z-index:-1}body.toplevel_page_wpseo_dashboard #wpcontent{padding-right:0!important}body.toplevel_page_wpseo_dashboard #wpfooter{padding-left:1rem}@media (min-width:768px){body.toplevel_page_wpseo_dashboard #wpfooter{padding-right:17rem;padding-left:2rem}}@media screen and (max-width:782px){body.toplevel_page_wpseo_dashboard .wp-responsive-open #wpbody{left:-190px}}body.toplevel_page_wpseo_dashboard #modal-search .yst-modal__close{margin-top:-.25rem}@media (min-width:783px) and (max-width:962px){body.toplevel_page_wpseo_dashboard.sticky-menu .yst-root .yst-notifications--bottom-left{right:calc(160px + 2rem)}}@media (min-width:783px) and (max-width:963px){body.toplevel_page_wpseo_dashboard.sticky-menu.auto-fold .yst-root .yst-notifications--bottom-left,body.toplevel_page_wpseo_dashboard.sticky-menu.folded .yst-root .yst-notifications--bottom-left{right:calc(32px + 2rem)}}@media (min-width:962px){body.toplevel_page_wpseo_dashboard.sticky-menu.folded .yst-root .yst-notifications--bottom-left{right:calc(32px + 2rem)}}@media (max-width:783px){body.toplevel_page_wpseo_dashboard:not(.sticky-menu) .wp-responsive-open .yst-root .yst-notifications--bottom-left{right:calc(190px + 2rem)}}@media (min-width:601px) and (max-width:768px){body.toplevel_page_wpseo_dashboard .yst-root .yst-mobile-navigation__top{top:46px}}@media (min-width:783px){body.toplevel_page_wpseo_dashboard .yst-root .yst-mobile-navigation__top{display:none}}body.toplevel_page_wpseo_dashboard .yst-root .yst-mobile-navigation__dialog{z-index:99999}body.toplevel_page_wpseo_dashboard.rtl .yst-root .yst-replacevar .emoji-select-popover{right:0;left:auto}
|
||||
@@ -1 +0,0 @@
|
||||
body.toplevel_page_wpseo_dashboard{--tw-bg-opacity:1;background-color:rgb(241 245 249/var(--tw-bg-opacity));z-index:-1}body.toplevel_page_wpseo_dashboard #wpcontent{padding-left:0!important}body.toplevel_page_wpseo_dashboard #wpfooter{padding-right:1rem}@media (min-width:768px){body.toplevel_page_wpseo_dashboard #wpfooter{padding-left:17rem;padding-right:2rem}}@media screen and (max-width:782px){body.toplevel_page_wpseo_dashboard .wp-responsive-open #wpbody{right:-190px}}body.toplevel_page_wpseo_dashboard #modal-search .yst-modal__close{margin-top:-.25rem}@media (min-width:783px) and (max-width:962px){body.toplevel_page_wpseo_dashboard.sticky-menu .yst-root .yst-notifications--bottom-left{left:calc(160px + 2rem)}}@media (min-width:783px) and (max-width:963px){body.toplevel_page_wpseo_dashboard.sticky-menu.auto-fold .yst-root .yst-notifications--bottom-left,body.toplevel_page_wpseo_dashboard.sticky-menu.folded .yst-root .yst-notifications--bottom-left{left:calc(32px + 2rem)}}@media (min-width:962px){body.toplevel_page_wpseo_dashboard.sticky-menu.folded .yst-root .yst-notifications--bottom-left{left:calc(32px + 2rem)}}@media (max-width:783px){body.toplevel_page_wpseo_dashboard:not(.sticky-menu) .wp-responsive-open .yst-root .yst-notifications--bottom-left{left:calc(190px + 2rem)}}@media (min-width:601px) and (max-width:768px){body.toplevel_page_wpseo_dashboard .yst-root .yst-mobile-navigation__top{top:46px}}@media (min-width:783px){body.toplevel_page_wpseo_dashboard .yst-root .yst-mobile-navigation__top{display:none}}body.toplevel_page_wpseo_dashboard .yst-root .yst-mobile-navigation__dialog{z-index:99999}body.toplevel_page_wpseo_dashboard.rtl .yst-root .yst-replacevar .emoji-select-popover{left:0;right:auto}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+39
-28
File diff suppressed because one or more lines are too long
+167
-167
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -5,7 +5,7 @@ License: GPLv3
|
||||
License URI: http://www.gnu.org/licenses/gpl.html
|
||||
Tags: SEO, XML sitemap, Content analysis, Readability, Schema
|
||||
Tested up to: 6.6
|
||||
Stable tag: 23.6
|
||||
Stable tag: 23.7
|
||||
Requires PHP: 7.2.5
|
||||
|
||||
Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using the Yoast SEO plugin.
|
||||
@@ -274,6 +274,26 @@ Your question has most likely been answered on our help center: [yoast.com/help/
|
||||
|
||||
== Changelog ==
|
||||
|
||||
= 23.7 =
|
||||
|
||||
Release date: 2024-10-22
|
||||
|
||||
Yoast SEO 23.7 brings more enhancements and bugfixes. [Find more information about our software releases and updates here](https://yoa.st/release-22-10-24).
|
||||
|
||||
#### Enhancements
|
||||
|
||||
* Removes the _keyphrase in slug_ assessment for static home pages.
|
||||
|
||||
#### Bugfixes
|
||||
|
||||
* Fixes a bug where a database error would occur when there were no public taxonomies available for indexing.
|
||||
* Fixes a bug where another plugin running the `exit()` function inside the `plugin_loaded` hook would result in a fatal error. Props to [menno-ll](https://github.com/menno-ll).
|
||||
|
||||
#### Other
|
||||
|
||||
* Removes translation strings that are not meant for the Yoast SEO Free version from the plugin.
|
||||
* Resets the notice for search engines discouraged when changing Search engine visibility to visible.
|
||||
|
||||
= 23.6 =
|
||||
|
||||
Release date: 2024-10-08
|
||||
@@ -296,20 +316,5 @@ Yoast SEO 23.6 brings more enhancements and bugfixes. [Find more information abo
|
||||
|
||||
* Sets the minimum supported WordPress version to 6.5.
|
||||
|
||||
= 23.5 =
|
||||
|
||||
Release date: 2024-09-24
|
||||
|
||||
Yoast SEO 23.5 brings more enhancements and bugfixes. [Find more information about our software releases and updates here](https://yoa.st/release-24-9-24).
|
||||
|
||||
#### Enhancements
|
||||
|
||||
* Improves analysis score feedback labels in the publish sections.
|
||||
* Improves our integration with cache plugins by preventing flushing their cache when not needed.
|
||||
|
||||
#### Bugfixes
|
||||
|
||||
* Fixes a bug where Arabic keyphrases containing certain function words were not correctly matched.
|
||||
|
||||
= Earlier versions =
|
||||
For the changelog of earlier versions, please refer to [the changelog on yoast.com](https://yoa.st/yoast-seo-changelog).
|
||||
|
||||
+2
-2
@@ -57,7 +57,7 @@ abstract class Abstract_Indexing_Action implements Indexation_Action_Interface,
|
||||
$query = $this->get_select_query( $limit );
|
||||
|
||||
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Function get_count_query returns a prepared query.
|
||||
$unindexed_object_ids = $this->wpdb->get_col( $query );
|
||||
$unindexed_object_ids = ( $query === '' ) ? [] : $this->wpdb->get_col( $query );
|
||||
$count = (int) \count( $unindexed_object_ids );
|
||||
|
||||
\set_transient( static::UNINDEXED_LIMITED_COUNT_TRANSIENT, $count, ( \MINUTE_IN_SECONDS * 15 ) );
|
||||
@@ -83,7 +83,7 @@ abstract class Abstract_Indexing_Action implements Indexation_Action_Interface,
|
||||
$query = $this->get_count_query();
|
||||
|
||||
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Function get_count_query returns a prepared query.
|
||||
$count = $this->wpdb->get_var( $query );
|
||||
$count = ( $query === '' ) ? 0 : $this->wpdb->get_var( $query );
|
||||
|
||||
if ( \is_null( $count ) ) {
|
||||
return false;
|
||||
|
||||
+11
-2
@@ -83,7 +83,7 @@ class Indexable_Term_Indexation_Action extends Abstract_Indexing_Action {
|
||||
$query = $this->get_select_query( $this->get_limit() );
|
||||
|
||||
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Function get_select_query returns a prepared query.
|
||||
$term_ids = $this->wpdb->get_col( $query );
|
||||
$term_ids = ( $query === '' ) ? [] : $this->wpdb->get_col( $query );
|
||||
|
||||
$indexables = [];
|
||||
foreach ( $term_ids as $term_id ) {
|
||||
@@ -128,6 +128,10 @@ class Indexable_Term_Indexation_Action extends Abstract_Indexing_Action {
|
||||
$taxonomy_table = $this->wpdb->term_taxonomy;
|
||||
$public_taxonomies = $this->taxonomy->get_indexable_taxonomies();
|
||||
|
||||
if ( empty( $public_taxonomies ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$taxonomies_placeholders = \implode( ', ', \array_fill( 0, \count( $public_taxonomies ), '%s' ) );
|
||||
|
||||
$replacements = [ $this->version ];
|
||||
@@ -159,7 +163,12 @@ class Indexable_Term_Indexation_Action extends Abstract_Indexing_Action {
|
||||
$indexable_table = Model::get_table_name( 'Indexable' );
|
||||
$taxonomy_table = $this->wpdb->term_taxonomy;
|
||||
$public_taxonomies = $this->taxonomy->get_indexable_taxonomies();
|
||||
$placeholders = \implode( ', ', \array_fill( 0, \count( $public_taxonomies ), '%s' ) );
|
||||
|
||||
if ( empty( $public_taxonomies ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$placeholders = \implode( ', ', \array_fill( 0, \count( $public_taxonomies ), '%s' ) );
|
||||
|
||||
$replacements = [ $this->version ];
|
||||
\array_push( $replacements, ...$public_taxonomies );
|
||||
|
||||
+15
-2
@@ -52,6 +52,10 @@ class Term_Link_Indexing_Action extends Abstract_Link_Indexing_Action {
|
||||
protected function get_objects() {
|
||||
$query = $this->get_select_query( $this->get_limit() );
|
||||
|
||||
if ( $query === '' ) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Function get_select_query returns a prepared query.
|
||||
$terms = $this->wpdb->get_results( $query );
|
||||
|
||||
@@ -74,8 +78,13 @@ class Term_Link_Indexing_Action extends Abstract_Link_Indexing_Action {
|
||||
*/
|
||||
protected function get_count_query() {
|
||||
$public_taxonomies = $this->taxonomy_helper->get_indexable_taxonomies();
|
||||
$placeholders = \implode( ', ', \array_fill( 0, \count( $public_taxonomies ), '%s' ) );
|
||||
$indexable_table = Model::get_table_name( 'Indexable' );
|
||||
|
||||
if ( empty( $public_taxonomies ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$placeholders = \implode( ', ', \array_fill( 0, \count( $public_taxonomies ), '%s' ) );
|
||||
$indexable_table = Model::get_table_name( 'Indexable' );
|
||||
|
||||
// Warning: If this query is changed, makes sure to update the query in get_select_query as well.
|
||||
return $this->wpdb->prepare(
|
||||
@@ -102,6 +111,10 @@ class Term_Link_Indexing_Action extends Abstract_Link_Indexing_Action {
|
||||
protected function get_select_query( $limit = false ) {
|
||||
$public_taxonomies = $this->taxonomy_helper->get_indexable_taxonomies();
|
||||
|
||||
if ( empty( $public_taxonomies ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$indexable_table = Model::get_table_name( 'Indexable' );
|
||||
$replacements = $public_taxonomies;
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ use Yoast\WP\SEO\Helpers\Image_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Indexable_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Options_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Permalink_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Request_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Schema\ID_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Site_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Url_Helper;
|
||||
@@ -122,13 +121,6 @@ class Meta_Tags_Context extends Abstract_Presentation {
|
||||
*/
|
||||
private $id_helper;
|
||||
|
||||
/**
|
||||
* The request helper.
|
||||
*
|
||||
* @var Request_Helper
|
||||
*/
|
||||
private $request_helper;
|
||||
|
||||
/**
|
||||
* The WPSEO Replace Vars object.
|
||||
*
|
||||
@@ -184,7 +176,6 @@ class Meta_Tags_Context extends Abstract_Presentation {
|
||||
* @param Permalink_Helper $permalink_helper The permalink helper.
|
||||
* @param Indexable_Helper $indexable_helper The indexable helper.
|
||||
* @param Indexable_Repository $indexable_repository The indexable repository.
|
||||
* @param Request_Helper $request_helper The request helper.
|
||||
*/
|
||||
public function __construct(
|
||||
Options_Helper $options,
|
||||
@@ -196,8 +187,7 @@ class Meta_Tags_Context extends Abstract_Presentation {
|
||||
User_Helper $user,
|
||||
Permalink_Helper $permalink_helper,
|
||||
Indexable_Helper $indexable_helper,
|
||||
Indexable_Repository $indexable_repository,
|
||||
Request_Helper $request_helper
|
||||
Indexable_Repository $indexable_repository
|
||||
) {
|
||||
$this->options = $options;
|
||||
$this->url = $url;
|
||||
@@ -209,7 +199,6 @@ class Meta_Tags_Context extends Abstract_Presentation {
|
||||
$this->permalink_helper = $permalink_helper;
|
||||
$this->indexable_helper = $indexable_helper;
|
||||
$this->indexable_repository = $indexable_repository;
|
||||
$this->request_helper = $request_helper;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -625,7 +614,7 @@ class Meta_Tags_Context extends Abstract_Presentation {
|
||||
return $this->image->get_attachment_image_url( $this->main_image_id, 'full' );
|
||||
}
|
||||
|
||||
if ( $this->request_helper->is_rest_request() ) {
|
||||
if ( \wp_is_serving_rest_request() ) {
|
||||
return $this->get_main_image_url_for_rest_request();
|
||||
}
|
||||
|
||||
@@ -647,7 +636,7 @@ class Meta_Tags_Context extends Abstract_Presentation {
|
||||
* @return int|null The main image ID.
|
||||
*/
|
||||
public function generate_main_image_id() {
|
||||
if ( $this->request_helper->is_rest_request() ) {
|
||||
if ( \wp_is_serving_rest_request() ) {
|
||||
return $this->get_main_image_id_for_rest_request();
|
||||
}
|
||||
|
||||
|
||||
+39
-16
@@ -3,6 +3,7 @@
|
||||
namespace Yoast\WP\SEO\Dashboard\User_Interface;
|
||||
|
||||
use WPSEO_Admin_Asset_Manager;
|
||||
use Yoast\WP\SEO\Actions\Alert_Dismissal_Action;
|
||||
use Yoast\WP\SEO\Conditionals\Admin_Conditional;
|
||||
use Yoast\WP\SEO\Conditionals\New_Dashboard_Ui_Conditional;
|
||||
use Yoast\WP\SEO\Helpers\Current_Page_Helper;
|
||||
@@ -10,6 +11,7 @@ use Yoast\WP\SEO\Helpers\Notification_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Product_Helper;
|
||||
use Yoast\WP\SEO\Helpers\Short_Link_Helper;
|
||||
use Yoast\WP\SEO\Integrations\Integration_Interface;
|
||||
use Yoast\WP\SEO\Promotions\Application\Promotion_Manager;
|
||||
|
||||
/**
|
||||
* Class New_Dashboard_Page_Integration.
|
||||
@@ -56,27 +58,47 @@ class New_Dashboard_Page_Integration implements Integration_Interface {
|
||||
*/
|
||||
private $shortlink_helper;
|
||||
|
||||
/**
|
||||
* The promotion manager.
|
||||
*
|
||||
* @var Promotion_Manager $promotion_manager
|
||||
*/
|
||||
private $promotion_manager;
|
||||
|
||||
/**
|
||||
* The alert dismissal action.
|
||||
*
|
||||
* @var Alert_Dismissal_Action $alert_dismissal_action
|
||||
*/
|
||||
private $alert_dismissal_action;
|
||||
|
||||
/**
|
||||
* Constructs Academy_Integration.
|
||||
*
|
||||
* @param WPSEO_Admin_Asset_Manager $asset_manager The WPSEO_Admin_Asset_Manager.
|
||||
* @param Current_Page_Helper $current_page_helper The Current_Page_Helper.
|
||||
* @param Product_Helper $product_helper The Product_Helper.
|
||||
* @param Short_Link_Helper $shortlink_helper The Short_Link_Helper.
|
||||
* @param Notification_Helper $notification_helper The Notification_Helper.
|
||||
* @param WPSEO_Admin_Asset_Manager $asset_manager The WPSEO_Admin_Asset_Manager.
|
||||
* @param Current_Page_Helper $current_page_helper The Current_Page_Helper.
|
||||
* @param Product_Helper $product_helper The Product_Helper.
|
||||
* @param Short_Link_Helper $shortlink_helper The Short_Link_Helper.
|
||||
* @param Notification_Helper $notification_helper The Notification_Helper.
|
||||
* @param Alert_Dismissal_Action $alert_dismissal_action The alert dismissal action.
|
||||
* @param Promotion_Manager $promotion_manager The promotion manager.
|
||||
*/
|
||||
public function __construct(
|
||||
WPSEO_Admin_Asset_Manager $asset_manager,
|
||||
Current_Page_Helper $current_page_helper,
|
||||
Product_Helper $product_helper,
|
||||
Short_Link_Helper $shortlink_helper,
|
||||
Notification_Helper $notification_helper
|
||||
Notification_Helper $notification_helper,
|
||||
Alert_Dismissal_Action $alert_dismissal_action,
|
||||
Promotion_Manager $promotion_manager
|
||||
) {
|
||||
$this->asset_manager = $asset_manager;
|
||||
$this->current_page_helper = $current_page_helper;
|
||||
$this->product_helper = $product_helper;
|
||||
$this->shortlink_helper = $shortlink_helper;
|
||||
$this->notification_helper = $notification_helper;
|
||||
$this->asset_manager = $asset_manager;
|
||||
$this->current_page_helper = $current_page_helper;
|
||||
$this->product_helper = $product_helper;
|
||||
$this->shortlink_helper = $shortlink_helper;
|
||||
$this->notification_helper = $notification_helper;
|
||||
$this->alert_dismissal_action = $alert_dismissal_action;
|
||||
$this->promotion_manager = $promotion_manager;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -162,7 +184,7 @@ class New_Dashboard_Page_Integration implements Integration_Interface {
|
||||
*/
|
||||
private function get_script_data() {
|
||||
return [
|
||||
'preferences' => [
|
||||
'preferences' => [
|
||||
'isPremium' => $this->product_helper->is_premium(),
|
||||
'isRtl' => \is_rtl(),
|
||||
'pluginUrl' => \plugins_url( '', \WPSEO_FILE ),
|
||||
@@ -171,10 +193,11 @@ class New_Dashboard_Page_Integration implements Integration_Interface {
|
||||
'premiumCtbId' => 'f6a84663-465f-4cb5-8ba5-f7a6d72224b2',
|
||||
],
|
||||
],
|
||||
'linkParams' => $this->shortlink_helper->get_query_params(),
|
||||
'userEditUrl' => \add_query_arg( 'user_id', '{user_id}', \admin_url( 'user-edit.php' ) ),
|
||||
'problems' => $this->notification_helper->get_problems(),
|
||||
'notifications' => $this->notification_helper->get_notifications(),
|
||||
'linkParams' => $this->shortlink_helper->get_query_params(),
|
||||
'userEditUrl' => \add_query_arg( 'user_id', '{user_id}', \admin_url( 'user-edit.php' ) ),
|
||||
'alerts' => $this->notification_helper->get_alerts(),
|
||||
'currentPromotions' => $this->promotion_manager->get_current_promotions(),
|
||||
'dismissedAlerts' => $this->alert_dismissal_action->all_dismissed(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
+7
@@ -4,6 +4,8 @@ namespace Yoast\WP\SEO\Helpers;
|
||||
|
||||
/**
|
||||
* A helper object for the request state.
|
||||
*
|
||||
* @codeCoverageIgnore Because of deprecation.
|
||||
*/
|
||||
class Request_Helper {
|
||||
|
||||
@@ -11,8 +13,13 @@ class Request_Helper {
|
||||
* Checks if the current request is a REST request.
|
||||
*
|
||||
* @return bool True when the current request is a REST request.
|
||||
*
|
||||
* @deprecated 23.6
|
||||
* @codeCoverageIgnore
|
||||
*/
|
||||
public function is_rest_request() {
|
||||
\_deprecated_function( __METHOD__, 'Yoast SEO 23.6', 'wp_is_serving_rest_request' );
|
||||
|
||||
return \defined( 'REST_REQUEST' ) && \REST_REQUEST === true;
|
||||
}
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
<?php return array('reduxJsToolkit.js' => array('dependencies' => array('wp-polyfill', 'yoast-seo-redux-package'), 'version' => '425acbd30b98c737df6e'), 'analysisReport.js' => array('dependencies' => array('lodash', 'react', 'wp-i18n', 'wp-polyfill', 'yoast-seo-components-new-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => 'a0f12a824e5689dd0faf'), 'componentsNew.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-i18n', 'wp-polyfill', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-react-select', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '898e7a63226507fb9afc'), 'featureFlag.js' => array('dependencies' => array('wp-polyfill'), 'version' => '91e54e3dd01f59a724ae'), 'helpers.js' => array('dependencies' => array('lodash', 'react', 'wp-i18n', 'wp-polyfill', 'yoast-seo-prop-types-package', 'yoast-seo-styled-components-package'), 'version' => 'f38a5f8b9a9ba801e722'), 'replacementVariableEditor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-components', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'yoast-seo-components-new-package', 'yoast-seo-draft-js-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '3ef02d0813043f65de66'), 'searchMetadataPreviews.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-i18n', 'wp-polyfill', 'yoast-seo-analysis-package', 'yoast-seo-components-new-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-replacement-variable-editor-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '732af9131c98940bc630'), 'socialMetadataForms.js' => array('dependencies' => array('lodash', 'react', 'wp-i18n', 'wp-polyfill', 'yoast-seo-components-new-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-redux-package', 'yoast-seo-replacement-variable-editor-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '6c538797b828b87a5419'), 'styleGuide.js' => array('dependencies' => array('wp-polyfill', 'yoast-seo-helpers-package', 'yoast-seo-styled-components-package'), 'version' => 'a65ddb8de826da5fea4d'), 'uiLibrary.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-polyfill', 'yoast-seo-prop-types-package', 'yoast-seo-redux-js-toolkit-package'), 'version' => '99e8468b00214a533091'), 'chart.js.js' => array('dependencies' => array('wp-polyfill'), 'version' => '196fb6740f0ef8ce192a'), 'draftJs.js' => array('dependencies' => array('react', 'react-dom', 'wp-polyfill'), 'version' => 'f03ff0ae2ee1cf6bbc54'), 'jed.js' => array('dependencies' => array('wp-polyfill'), 'version' => '28697086e82ae1cd0e88'), 'propTypes.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4c546a0c9e97b70d3fe0'), 'reactHelmet.js' => array('dependencies' => array('react', 'wp-polyfill', 'yoast-seo-prop-types-package'), 'version' => 'b7d9f84f1dc499388f58'), 'redux.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e83451c8529be91b4af7'), 'styledComponents.js' => array('dependencies' => array('react', 'wp-polyfill'), 'version' => 'f030a78c47ee9be46c07'), 'analysis.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill', 'yoast-seo-feature-flag-package'), 'version' => 'ac0e34c89d7739b10963'));
|
||||
<?php return array('reduxJsToolkit.js' => array('dependencies' => array('wp-polyfill', 'yoast-seo-redux-package'), 'version' => '425acbd30b98c737df6e'), 'analysisReport.js' => array('dependencies' => array('lodash', 'react', 'wp-i18n', 'wp-polyfill', 'yoast-seo-components-new-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => 'a0f12a824e5689dd0faf'), 'componentsNew.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-i18n', 'wp-polyfill', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-react-select', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '898e7a63226507fb9afc'), 'featureFlag.js' => array('dependencies' => array('wp-polyfill'), 'version' => '91e54e3dd01f59a724ae'), 'helpers.js' => array('dependencies' => array('lodash', 'react', 'wp-i18n', 'wp-polyfill', 'yoast-seo-prop-types-package', 'yoast-seo-styled-components-package'), 'version' => 'f38a5f8b9a9ba801e722'), 'replacementVariableEditor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-components', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'yoast-seo-components-new-package', 'yoast-seo-draft-js-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '3ef02d0813043f65de66'), 'searchMetadataPreviews.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-i18n', 'wp-polyfill', 'yoast-seo-analysis-package', 'yoast-seo-components-new-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-replacement-variable-editor-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '732af9131c98940bc630'), 'socialMetadataForms.js' => array('dependencies' => array('lodash', 'react', 'wp-i18n', 'wp-polyfill', 'yoast-seo-components-new-package', 'yoast-seo-helpers-package', 'yoast-seo-prop-types-package', 'yoast-seo-redux-package', 'yoast-seo-replacement-variable-editor-package', 'yoast-seo-style-guide-package', 'yoast-seo-styled-components-package'), 'version' => '6c538797b828b87a5419'), 'styleGuide.js' => array('dependencies' => array('wp-polyfill', 'yoast-seo-helpers-package', 'yoast-seo-styled-components-package'), 'version' => 'a65ddb8de826da5fea4d'), 'uiLibrary.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-polyfill', 'yoast-seo-prop-types-package', 'yoast-seo-redux-js-toolkit-package'), 'version' => '52e146a897258f0e0a1c'), 'chart.js.js' => array('dependencies' => array('wp-polyfill'), 'version' => '196fb6740f0ef8ce192a'), 'draftJs.js' => array('dependencies' => array('react', 'react-dom', 'wp-polyfill'), 'version' => 'f03ff0ae2ee1cf6bbc54'), 'jed.js' => array('dependencies' => array('wp-polyfill'), 'version' => '28697086e82ae1cd0e88'), 'propTypes.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4c546a0c9e97b70d3fe0'), 'reactHelmet.js' => array('dependencies' => array('react', 'wp-polyfill', 'yoast-seo-prop-types-package'), 'version' => 'b7d9f84f1dc499388f58'), 'redux.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e83451c8529be91b4af7'), 'styledComponents.js' => array('dependencies' => array('react', 'wp-polyfill'), 'version' => 'f030a78c47ee9be46c07'), 'analysis.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill', 'yoast-seo-feature-flag-package'), 'version' => '44675fbce24d2834e8b0'));
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -2776,7 +2776,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getMetaTagsContextService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Context\\Meta_Tags_Context'] = new \Yoast\WP\SEO\Context\Meta_Tags_Context(${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Url_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Url_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Url_Helper'] = new \Yoast\WP\SEO\Helpers\Url_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Image_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Image_Helper'] : $this->getImageHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Schema\\ID_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Schema\\ID_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Schema\\ID_Helper'] = new \Yoast\WP\SEO\Helpers\Schema\ID_Helper())) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Replace_Vars']) ? $this->services['WPSEO_Replace_Vars'] : $this->getWPSEOReplaceVarsService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Site_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Site_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Site_Helper'] = new \Yoast\WP\SEO\Helpers\Site_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\User_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\User_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\User_Helper'] = new \Yoast\WP\SEO\Helpers\User_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Permalink_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Permalink_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Permalink_Helper'] = new \Yoast\WP\SEO\Helpers\Permalink_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Indexable_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Indexable_Helper'] : $this->getIndexableHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository']) ? $this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository'] : $this->getIndexableRepositoryService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] = new \Yoast\WP\SEO\Helpers\Request_Helper())) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Context\\Meta_Tags_Context'] = new \Yoast\WP\SEO\Context\Meta_Tags_Context(${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Url_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Url_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Url_Helper'] = new \Yoast\WP\SEO\Helpers\Url_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Image_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Image_Helper'] : $this->getImageHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Schema\\ID_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Schema\\ID_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Schema\\ID_Helper'] = new \Yoast\WP\SEO\Helpers\Schema\ID_Helper())) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Replace_Vars']) ? $this->services['WPSEO_Replace_Vars'] : $this->getWPSEOReplaceVarsService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Site_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Site_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Site_Helper'] = new \Yoast\WP\SEO\Helpers\Site_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\User_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\User_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\User_Helper'] = new \Yoast\WP\SEO\Helpers\User_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Permalink_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Permalink_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Permalink_Helper'] = new \Yoast\WP\SEO\Helpers\Permalink_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Indexable_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Indexable_Helper'] : $this->getIndexableHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository']) ? $this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository'] : $this->getIndexableRepositoryService()) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2786,7 +2786,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getNewDashboardPageIntegrationService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Dashboard\\User_Interface\\New_Dashboard_Page_Integration'] = new \Yoast\WP\SEO\Dashboard\User_Interface\New_Dashboard_Page_Integration(${($_ = isset($this->services['WPSEO_Admin_Asset_Manager']) ? $this->services['WPSEO_Admin_Asset_Manager'] : $this->getWPSEOAdminAssetManagerService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Current_Page_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Current_Page_Helper'] : $this->getCurrentPageHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] = new \Yoast\WP\SEO\Helpers\Product_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Short_Link_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Short_Link_Helper'] : $this->getShortLinkHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Notification_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Notification_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Notification_Helper'] = new \Yoast\WP\SEO\Helpers\Notification_Helper())) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Dashboard\\User_Interface\\New_Dashboard_Page_Integration'] = new \Yoast\WP\SEO\Dashboard\User_Interface\New_Dashboard_Page_Integration(${($_ = isset($this->services['WPSEO_Admin_Asset_Manager']) ? $this->services['WPSEO_Admin_Asset_Manager'] : $this->getWPSEOAdminAssetManagerService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Current_Page_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Current_Page_Helper'] : $this->getCurrentPageHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] = new \Yoast\WP\SEO\Helpers\Product_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Short_Link_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Short_Link_Helper'] : $this->getShortLinkHelperService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Notification_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Notification_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Notification_Helper'] = new \Yoast\WP\SEO\Helpers\Notification_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Actions\\Alert_Dismissal_Action']) ? $this->services['Yoast\\WP\\SEO\\Actions\\Alert_Dismissal_Action'] : $this->getAlertDismissalActionService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Promotions\\Application\\Promotion_Manager']) ? $this->services['Yoast\\WP\\SEO\\Promotions\\Application\\Promotion_Manager'] : $this->getPromotionManagerService()) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3359,9 +3359,13 @@ class Cached_Container extends Container
|
||||
* Gets the public 'Yoast\WP\SEO\Helpers\Request_Helper' shared autowired service.
|
||||
*
|
||||
* @return \Yoast\WP\SEO\Helpers\Request_Helper
|
||||
*
|
||||
* @deprecated Yoast\WP\SEO\Helpers\Request_Helper is deprecated since version 23.6!
|
||||
*/
|
||||
protected function getRequestHelperService()
|
||||
{
|
||||
@trigger_error('Yoast\\WP\\SEO\\Helpers\\Request_Helper is deprecated since version 23.6!', E_USER_DEPRECATED);
|
||||
|
||||
return $this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] = new \Yoast\WP\SEO\Helpers\Request_Helper();
|
||||
}
|
||||
|
||||
@@ -3796,7 +3800,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getFirstTimeConfigurationNoticeIntegrationService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Admin\\First_Time_Configuration_Notice_Integration'] = new \Yoast\WP\SEO\Integrations\Admin\First_Time_Configuration_Notice_Integration(${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\First_Time_Configuration_Notice_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\First_Time_Configuration_Notice_Helper'] : $this->getFirstTimeConfigurationNoticeHelperService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Admin_Asset_Manager']) ? $this->services['WPSEO_Admin_Asset_Manager'] : $this->getWPSEOAdminAssetManagerService()) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Admin\\First_Time_Configuration_Notice_Integration'] = new \Yoast\WP\SEO\Integrations\Admin\First_Time_Configuration_Notice_Integration(${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\First_Time_Configuration_Notice_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\First_Time_Configuration_Notice_Helper'] : $this->getFirstTimeConfigurationNoticeHelperService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Admin_Asset_Manager']) ? $this->services['WPSEO_Admin_Asset_Manager'] : $this->getWPSEOAdminAssetManagerService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional']) ? $this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional'] : ($this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional'] = new \Yoast\WP\SEO\Conditionals\New_Dashboard_Ui_Conditional())) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3876,7 +3880,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getInstallationSuccessIntegrationService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Admin\\Installation_Success_Integration'] = new \Yoast\WP\SEO\Integrations\Admin\Installation_Success_Integration(${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] = new \Yoast\WP\SEO\Helpers\Product_Helper())) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Admin\\Installation_Success_Integration'] = new \Yoast\WP\SEO\Integrations\Admin\Installation_Success_Integration(${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] = new \Yoast\WP\SEO\Helpers\Product_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional']) ? $this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional'] : ($this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional'] = new \Yoast\WP\SEO\Conditionals\New_Dashboard_Ui_Conditional())) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3980,7 +3984,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getWorkoutsIntegrationService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Admin\\Workouts_Integration'] = new \Yoast\WP\SEO\Integrations\Admin\Workouts_Integration(${($_ = isset($this->services['WPSEO_Addon_Manager']) ? $this->services['WPSEO_Addon_Manager'] : $this->getWPSEOAddonManagerService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Admin_Asset_Manager']) ? $this->services['WPSEO_Admin_Asset_Manager'] : $this->getWPSEOAdminAssetManagerService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] = new \Yoast\WP\SEO\Helpers\Product_Helper())) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Admin\\Workouts_Integration'] = new \Yoast\WP\SEO\Integrations\Admin\Workouts_Integration(${($_ = isset($this->services['WPSEO_Addon_Manager']) ? $this->services['WPSEO_Addon_Manager'] : $this->getWPSEOAddonManagerService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Admin_Asset_Manager']) ? $this->services['WPSEO_Admin_Asset_Manager'] : $this->getWPSEOAdminAssetManagerService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Product_Helper'] = new \Yoast\WP\SEO\Helpers\Product_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional']) ? $this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional'] : ($this->services['Yoast\\WP\\SEO\\Conditionals\\New_Dashboard_Ui_Conditional'] = new \Yoast\WP\SEO\Conditionals\New_Dashboard_Ui_Conditional())) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -4040,7 +4044,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getBreadcrumbsBlockService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Blocks\\Breadcrumbs_Block'] = new \Yoast\WP\SEO\Integrations\Blocks\Breadcrumbs_Block(${($_ = isset($this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer']) ? $this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer'] : $this->getMetaTagsContextMemoizerService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Replace_Vars']) ? $this->services['WPSEO_Replace_Vars'] : $this->getWPSEOReplaceVarsService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface']) ? $this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface'] : $this->getHelpersSurfaceService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository']) ? $this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository'] : $this->getIndexableRepositoryService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] = new \Yoast\WP\SEO\Helpers\Request_Helper())) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Blocks\\Breadcrumbs_Block'] = new \Yoast\WP\SEO\Integrations\Blocks\Breadcrumbs_Block(${($_ = isset($this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer']) ? $this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer'] : $this->getMetaTagsContextMemoizerService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Replace_Vars']) ? $this->services['WPSEO_Replace_Vars'] : $this->getWPSEOReplaceVarsService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface']) ? $this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface'] : $this->getHelpersSurfaceService()) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository']) ? $this->services['Yoast\\WP\\SEO\\Repositories\\Indexable_Repository'] : $this->getIndexableRepositoryService()) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -4306,7 +4310,7 @@ class Cached_Container extends Container
|
||||
*/
|
||||
protected function getFrontEndIntegrationService()
|
||||
{
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Front_End_Integration'] = new \Yoast\WP\SEO\Integrations\Front_End_Integration(${($_ = isset($this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer']) ? $this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer'] : $this->getMetaTagsContextMemoizerService()) && false ?: '_'}, $this, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Request_Helper'] = new \Yoast\WP\SEO\Helpers\Request_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface']) ? $this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface'] : $this->getHelpersSurfaceService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Replace_Vars']) ? $this->services['WPSEO_Replace_Vars'] : $this->getWPSEOReplaceVarsService()) && false ?: '_'});
|
||||
return $this->services['Yoast\\WP\\SEO\\Integrations\\Front_End_Integration'] = new \Yoast\WP\SEO\Integrations\Front_End_Integration(${($_ = isset($this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer']) ? $this->services['Yoast\\WP\\SEO\\Memoizers\\Meta_Tags_Context_Memoizer'] : $this->getMetaTagsContextMemoizerService()) && false ?: '_'}, $this, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper']) ? $this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] : ($this->services['Yoast\\WP\\SEO\\Helpers\\Options_Helper'] = new \Yoast\WP\SEO\Helpers\Options_Helper())) && false ?: '_'}, ${($_ = isset($this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface']) ? $this->services['Yoast\\WP\\SEO\\Surfaces\\Helpers_Surface'] : $this->getHelpersSurfaceService()) && false ?: '_'}, ${($_ = isset($this->services['WPSEO_Replace_Vars']) ? $this->services['WPSEO_Replace_Vars'] : $this->getWPSEOReplaceVarsService()) && false ?: '_'});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -51,78 +51,24 @@ class Notification_Helper {
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses all the notifications to an array with just warnings notifications, and splitting them between dismissed
|
||||
* and active.
|
||||
* Parses all the notifications to an array with just id, message, nonce, type and dismissed.
|
||||
*
|
||||
* @return array<Yoast_Notification>
|
||||
* @return array<string,string|bool>
|
||||
*/
|
||||
public function get_notifications(): array {
|
||||
$all_notifications = $this->get_sorted_notifications();
|
||||
$notifications = \array_filter(
|
||||
$all_notifications,
|
||||
static function ( $notification ) {
|
||||
return $notification->get_type() !== 'error';
|
||||
}
|
||||
);
|
||||
$dismissed_notifications = \array_filter(
|
||||
$notifications,
|
||||
public function get_alerts(): array {
|
||||
$all_notifications = $this->get_sorted_notifications();
|
||||
|
||||
return \array_map(
|
||||
function ( $notification ) {
|
||||
return $this->is_notification_dismissed( $notification );
|
||||
}
|
||||
return [
|
||||
'id' => $notification->get_id(),
|
||||
'message' => $notification->get_message(),
|
||||
'nonce' => $notification->get_nonce(),
|
||||
'type' => $notification->get_type(),
|
||||
'dismissed' => $this->is_notification_dismissed( $notification ),
|
||||
];
|
||||
},
|
||||
$all_notifications
|
||||
);
|
||||
$active_notifications = \array_diff( $notifications, $dismissed_notifications );
|
||||
|
||||
return [
|
||||
'dismissed' => \array_map(
|
||||
static function ( $notification ) {
|
||||
return $notification->to_array();
|
||||
},
|
||||
$dismissed_notifications
|
||||
),
|
||||
'active' => \array_map(
|
||||
static function ( $notification ) {
|
||||
return $notification->to_array();
|
||||
},
|
||||
$active_notifications
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses all the notifications to an array with just error notifications, and splitting them between dismissed and
|
||||
* active.
|
||||
*
|
||||
* @return array<Yoast_Notification>
|
||||
*/
|
||||
public function get_problems(): array {
|
||||
$all_notifications = $this->get_sorted_notifications();
|
||||
$problems = \array_filter(
|
||||
$all_notifications,
|
||||
static function ( $notification ) {
|
||||
return $notification->get_type() === 'error';
|
||||
}
|
||||
);
|
||||
$dismissed_problems = \array_filter(
|
||||
$problems,
|
||||
function ( $notification ) {
|
||||
return $this->is_notification_dismissed( $notification );
|
||||
}
|
||||
);
|
||||
$active_problems = \array_diff( $problems, $dismissed_problems );
|
||||
|
||||
return [
|
||||
'dismissed' => \array_map(
|
||||
static function ( $notification ) {
|
||||
return $notification->to_array();
|
||||
},
|
||||
$dismissed_problems
|
||||
),
|
||||
'active' => \array_map(
|
||||
static function ( $notification ) {
|
||||
return $notification->to_array();
|
||||
},
|
||||
$active_problems
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -112,9 +112,8 @@ class Deactivated_Premium_Integration implements Integration_Interface {
|
||||
'action': 'dismiss_premium_deactivated_notice',
|
||||
};
|
||||
|
||||
jQuery.post( ajaxurl, data, function( response ) {
|
||||
jQuery( '#yoast-premium-deactivated-notice' ).hide();
|
||||
});
|
||||
jQuery( '#yoast-premium-deactivated-notice' ).hide();
|
||||
jQuery.post( ajaxurl, data, function( response ) {});
|
||||
}
|
||||
|
||||
jQuery( document ).ready( function() {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user