Skip to content

Commit f7d3b9a

Browse files
enricobattocchienricobattocchi
committed
Merge branch 'release/19.12' into trunk
2 parents bede607 + 3209cf5 commit f7d3b9a

7 files changed

Lines changed: 35 additions & 71 deletions

File tree

‎admin/views/licenses.php‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
];
9090
}
9191

92+
// The total number of plugins to consider is the length of the array + 1 for Premium.
93+
// @phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound
94+
$number_plugins_total = ( count( $extensions ) + 1 );
95+
// @phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound
96+
$number_plugins_active = 0;
97+
9298
$extensions['yoast-seo-plugin-subscription'] = [
9399
'buyUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/premium-page-bundle-buy' ),
94100
'infoUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/premium-page-bundle-info' ),
@@ -177,7 +183,10 @@
177183
<?php if ( $addon_manager->is_installed( WPSEO_Addon_Manager::PREMIUM_SLUG ) ) : ?>
178184
<div class="yoast-button yoast-button--noarrow yoast-button--extension yoast-button--extension-installed"><?php esc_html_e( 'Installed', 'wordpress-seo' ); ?></div>
179185

180-
<?php if ( $has_valid_premium_subscription ) : ?>
186+
<?php
187+
if ( $has_valid_premium_subscription ) :
188+
$number_plugins_active++;
189+
?>
181190
<div class="yoast-button yoast-button--noarrow yoast-button--extension yoast-button--extension-activated"><?php esc_html_e( 'Activated', 'wordpress-seo' ); ?></div>
182191
<a target="_blank" href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/13k' ); ?>" class="yoast-link--license">
183192
<?php
@@ -263,6 +272,11 @@
263272

264273
<?php
265274
foreach ( $extensions as $slug => $extension ) :
275+
276+
// Skip the "All the plugins" card if the user has already all the plugins active.
277+
if ( $slug === 'yoast-seo-plugin-subscription' && $number_plugins_active === $number_plugins_total ) {
278+
continue;
279+
}
266280
?>
267281
<section class="yoast-promoblock secondary yoast-promo-extension">
268282
<h3>
@@ -279,7 +293,10 @@
279293
<?php if ( $addon_manager->is_installed( $slug ) ) : ?>
280294
<div class="yoast-button yoast-button--noarrow yoast-button--extension yoast-button--extension-installed"><?php esc_html_e( 'Installed', 'wordpress-seo' ); ?></div>
281295

282-
<?php if ( $addon_manager->has_valid_subscription( $slug ) ) : ?>
296+
<?php
297+
if ( $addon_manager->has_valid_subscription( $slug ) ) :
298+
$number_plugins_active++;
299+
?>
283300
<div class="yoast-button yoast-button--noarrow yoast-button--extension yoast-button--extension-activated"><?php esc_html_e( 'Activated', 'wordpress-seo' ); ?></div>
284301
<a target="_blank" href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/13k' ); ?>" class="yoast-link--license">
285302
<?php

‎inc/class-wpseo-admin-bar-menu.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* @package WPSEO
66
*/
77

8+
use WPSEO_Shortlinker;
89
use Yoast\WP\SEO\Helpers\Product_Helper;
910
use Yoast\WP\SEO\Helpers\Score_Icon_Helper;
1011
use Yoast\WP\SEO\Models\Indexable;
@@ -460,17 +461,17 @@ protected function add_seo_tools_submenu( WP_Admin_Bar $wp_admin_bar ) {
460461
[
461462
'id' => 'wpseo-semrush',
462463
'title' => 'Semrush',
463-
'href' => 'https://yoa.st/admin-bar-semrush',
464+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-semrush' ),
464465
],
465466
[
466467
'id' => 'wpseo-wincher',
467468
'title' => 'Wincher',
468-
'href' => 'https://yoa.st/admin-bar-wincher',
469+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-wincher' ),
469470
],
470471
[
471472
'id' => 'wpseo-google-trends',
472473
'title' => 'Google trends',
473-
'href' => 'https://yoa.st/admin-bar-gtrends',
474+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-gtrends' ),
474475
],
475476
];
476477

@@ -497,17 +498,17 @@ protected function add_how_to_submenu( WP_Admin_Bar $wp_admin_bar ) {
497498
[
498499
'id' => 'wpseo-learn-seo',
499500
'title' => __( 'Learn more SEO', 'wordpress-seo' ),
500-
'href' => 'https://yoa.st/admin-bar-learn-more-seo',
501+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-learn-more-seo' ),
501502
],
502503
[
503504
'id' => 'wpseo-improve-blogpost',
504505
'title' => __( 'Improve your blog post', 'wordpress-seo' ),
505-
'href' => 'https://yoa.st/admin-bar-improve-blog-post',
506+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-improve-blog-post' ),
506507
],
507508
[
508509
'id' => 'wpseo-write-better-content',
509510
'title' => __( 'Write better content', 'wordpress-seo' ),
510-
'href' => 'https://yoa.st/admin-bar-write-better',
511+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-write-better' ),
511512
],
512513
];
513514

@@ -534,22 +535,22 @@ protected function add_get_help_submenu( WP_Admin_Bar $wp_admin_bar ) {
534535
[
535536
'id' => 'wpseo-yoast-help',
536537
'title' => __( 'Yoast.com help section', 'wordpress-seo' ),
537-
'href' => 'https://yoa.st/admin-bar-yoast-help',
538+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-yoast-help' ),
538539
],
539540
[
540541
'id' => 'wpseo-premium-support',
541542
'title' => __( 'Yoast Premium support', 'wordpress-seo' ),
542-
'href' => 'https://yoa.st/admin-bar-premium-support',
543+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-premium-support' ),
543544
],
544545
[
545546
'id' => 'wpseo-wp-support-forums',
546547
'title' => __( 'WordPress.org support forums', 'wordpress-seo' ),
547-
'href' => 'https://yoa.st/admin-bar-wp-support-forums',
548+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-wp-support-forums' ),
548549
],
549550
[
550551
'id' => 'wpseo-learn-seo-2',
551552
'title' => __( 'Learn more SEO', 'wordpress-seo' ),
552-
'href' => 'https://yoa.st/admin-bar-learn-more-seo-help',
553+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-learn-more-seo-help' ),
553554
],
554555
];
555556

@@ -569,7 +570,7 @@ protected function add_premium_link( WP_Admin_Bar $wp_admin_bar ) {
569570
'parent' => self::MENU_IDENTIFIER,
570571
'id' => 'wpseo-get-premium',
571572
'title' => __( 'Get Yoast SEO Premium', 'wordpress-seo' ) . ' &raquo;',
572-
'href' => 'https://yoa.st/admin-bar-get-premium',
573+
'href' => WPSEO_Shortlinker::get( 'https://yoa.st/admin-bar-get-premium' ),
573574
'meta' => [
574575
'tabindex' => '0',
575576
'target' => '_blank',

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"typescript": "^4.2.4"
8585
},
8686
"yoast": {
87-
"pluginVersion": "19.12-RC5"
87+
"pluginVersion": "19.12-RC6"
8888
},
8989
"version": "0.0.0"
9090
}

‎packages/js/src/integrations-page/integrations-grid.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default function IntegrationsGrid() {
101101
<hr className="yst-my-12" />
102102

103103
<Section
104-
title={ __( "SEO Tool integrations", "wordpress-seo" ) }
104+
title={ __( "Other integrations", "wordpress-seo" ) }
105105
elements={ SEOToolsIntegrations }
106106
/>
107107

‎packages/js/src/integrations-page/seo-tools-integrations.js‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,65 +2,11 @@ import { createInterpolateElement } from "@wordpress/element";
22
import { __, sprintf } from "@wordpress/i18n";
33

44
import { getInitialState, getIsNetworkControlEnabled, updateIntegrationState, getIsMultisiteAvailable } from "./helper";
5-
import { ReactComponent as SemrushLogo } from "../../images/semrush-logo.svg";
6-
import { ReactComponent as WincherLogo } from "../../images/wincher-logo.svg";
75
import { ReactComponent as ZapierLogo } from "../../images/zapier-logo.svg";
86
import { ReactComponent as WordproofLogo } from "../../images/wordproof-logo.svg";
97
import { ToggleableIntegration } from "./toggleable-integration";
108

119
const integrations = [
12-
{
13-
name: "Semrush",
14-
claim: createInterpolateElement(
15-
sprintf(
16-
/* translators: 1: bold open tag; 2: Semrush; 3: bold close tag. */
17-
__( "Use %1$s%2$s%3$s to do keyword research - without leaving your post", "wordpress-seo" ),
18-
"<strong>",
19-
"Semrush",
20-
"</strong>"
21-
), {
22-
strong: <strong />,
23-
}
24-
),
25-
learnMoreLink: "https://yoa.st/integrations-about-semrush",
26-
logoLink: "http://yoa.st/semrush-prices-wordpress",
27-
slug: "semrush",
28-
description: sprintf(
29-
/* translators: 1: Semrush */
30-
__( "Find out what your audience is searching for with %s data right in your sidebar.", "wordpress-seo" ),
31-
"Semrush"
32-
),
33-
isPremium: false,
34-
isNew: false,
35-
isMultisiteAvailable: true,
36-
logo: SemrushLogo,
37-
},
38-
{
39-
name: "Wincher",
40-
claim: createInterpolateElement(
41-
sprintf(
42-
/* translators: 1: bold open tag; 2: Wincher; 3: bold close tag. */
43-
__( "Track your rankings through time with %1$s%2$s%3$s", "wordpress-seo" ),
44-
"<strong>",
45-
"Wincher",
46-
"</strong>"
47-
), {
48-
strong: <strong />,
49-
}
50-
),
51-
learnMoreLink: "https://yoa.st/integrations-about-wincher",
52-
logoLink: "https://yoa.st/integrations-logo-wincher",
53-
slug: "wincher",
54-
description: sprintf(
55-
/* translators: 1: Wincher */
56-
__( "Keep an eye on how your posts are ranking by connecting to your %s account.", "wordpress-seo" ),
57-
"Wincher"
58-
),
59-
isPremium: false,
60-
isNew: false,
61-
isMultisiteAvailable: false,
62-
logo: WincherLogo,
63-
},
6410
{
6511
name: "WordProof",
6612
claim: createInterpolateElement(

‎wp-seo-main.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* {@internal Nobody should be able to overrule the real version number as this can cause
1616
* serious issues with the options, so no if ( ! defined() ).}}
1717
*/
18-
define( 'WPSEO_VERSION', '19.12-RC5' );
18+
define( 'WPSEO_VERSION', '19.12-RC6' );
1919

2020

2121
if ( ! defined( 'WPSEO_PATH' ) ) {

‎wp-seo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @wordpress-plugin
1010
* Plugin Name: Yoast SEO
11-
* Version: 19.12-RC5
11+
* Version: 19.12-RC6
1212
* Plugin URI: https://yoa.st/1uj
1313
* Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
1414
* Author: Team Yoast

0 commit comments

Comments
 (0)
⚡