Updating yoast seo to the latest version 3.6.1

admin/class-admin.php

@@ -575,7 +575,7 @@ public function filter_stopwords_from_slug( $slug, $post_title ) {
 	 */
 	public function filter_settings_pages( array $pages ) {
 
-		if ( $this->options['enable_setting_pages'] ) {
+		if ( wpseo_advanced_settings_enabled( $this->options ) ) {
 			return $pages;
 		}
 

admin/views/tabs/dashboard/features.php

@@ -33,7 +33,7 @@
 <h2>Features</h2>
 
 <?php echo esc_html( sprintf(
-	__( '%1$s comes with a lot of features. You can enable / disable some of them below. However, we recommend keeping everything enabled in order to have the best results.', 'wordpress-seo' ),
+	__( '%1$s comes with a lot of features. You can enable / disable some of them below.', 'wordpress-seo' ),
 	'Yoast SEO'
 ) ) ?>
 <?php foreach ( $features as $feature ) : ?>

inc/wpseo-non-ajax-functions.php

@@ -247,6 +247,9 @@ function wpseo_admin_bar_menu() {
 
 	// @todo: add links to bulk title and bulk description edit pages.
 	if ( $user_is_admin_or_networkadmin ) {
+
+		$advanced_settings = wpseo_advanced_settings_enabled( $options );
+
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'wpseo-menu',
 			'id'     => 'wpseo-settings',
@@ -259,36 +262,38 @@ function wpseo_admin_bar_menu() {
 			'title'  => __( 'Dashboard', 'wordpress-seo' ),
 			'href'   => admin_url( 'admin.php?page=wpseo_dashboard' ),
 		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wpseo-settings',
-			'id'     => 'wpseo-titles',
-			'title'  => __( 'Titles & Metas', 'wordpress-seo' ),
-			'href'   => admin_url( 'admin.php?page=wpseo_titles' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wpseo-settings',
-			'id'     => 'wpseo-social',
-			'title'  => __( 'Social', 'wordpress-seo' ),
-			'href'   => admin_url( 'admin.php?page=wpseo_social' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wpseo-settings',
-			'id'     => 'wpseo-xml',
-			'title'  => __( 'XML Sitemaps', 'wordpress-seo' ),
-			'href'   => admin_url( 'admin.php?page=wpseo_xml' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wpseo-settings',
-			'id'     => 'wpseo-wpseo-advanced',
-			'title'  => __( 'Advanced', 'wordpress-seo' ),
-			'href'   => admin_url( 'admin.php?page=wpseo_advanced' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wpseo-settings',
-			'id'     => 'wpseo-tools',
-			'title'  => __( 'Tools', 'wordpress-seo' ),
-			'href'   => admin_url( 'admin.php?page=wpseo_tools' ),
-		) );
+		if ( $advanced_settings ) {
+			$wp_admin_bar->add_menu( array(
+				'parent' => 'wpseo-settings',
+				'id'     => 'wpseo-titles',
+				'title'  => __( 'Titles & Metas', 'wordpress-seo' ),
+				'href'   => admin_url( 'admin.php?page=wpseo_titles' ),
+			) );
+			$wp_admin_bar->add_menu( array(
+				'parent' => 'wpseo-settings',
+				'id'     => 'wpseo-social',
+				'title'  => __( 'Social', 'wordpress-seo' ),
+				'href'   => admin_url( 'admin.php?page=wpseo_social' ),
+			) );
+			$wp_admin_bar->add_menu( array(
+				'parent' => 'wpseo-settings',
+				'id'     => 'wpseo-xml',
+				'title'  => __( 'XML Sitemaps', 'wordpress-seo' ),
+				'href'   => admin_url( 'admin.php?page=wpseo_xml' ),
+			) );
+			$wp_admin_bar->add_menu( array(
+				'parent' => 'wpseo-settings',
+				'id'     => 'wpseo-wpseo-advanced',
+				'title'  => __( 'Advanced', 'wordpress-seo' ),
+				'href'   => admin_url( 'admin.php?page=wpseo_advanced' ),
+			) );
+			$wp_admin_bar->add_menu( array(
+				'parent' => 'wpseo-settings',
+				'id'     => 'wpseo-tools',
+				'title'  => __( 'Tools', 'wordpress-seo' ),
+				'href'   => admin_url( 'admin.php?page=wpseo_tools' ),
+			) );
+		}
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'wpseo-settings',
 			'id'     => 'wpseo-search-console',
@@ -298,15 +303,15 @@ function wpseo_admin_bar_menu() {
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'wpseo-settings',
 			'id'     => 'wpseo-licenses',
-			'title'  => '<span style="color:#f18500">' . __( 'Extensions', 'wordpress-seo' ) . '</span>',
+			'title' => '<span style="color:#f18500">' . __( 'Go Premium', 'wordpress-seo' ) . '</span>',
 			'href'   => admin_url( 'admin.php?page=wpseo_licenses' ),
 		) );
 	}
 
 }
 
 /**
- * Returns the SEO score element for the adminbar.
+ * Returns the SEO score element for the admin bar.
  *
  * @return string
  */
@@ -418,6 +423,16 @@ function allow_custom_field_edits( $allcaps, $cap, $args ) {
 
 add_filter( 'user_has_cap', 'allow_custom_field_edits', 0, 3 );
 
+/**
+ * Detects if the advanced settings are enabled.
+ *
+ * @param array $wpseo_options The wpseo settings.
+ *
+ * @returns boolean True if the advanced settings are enabled, false if not.
+ */
+function wpseo_advanced_settings_enabled( $wpseo_options ) {
+	return ( $wpseo_options['enable_setting_pages'] === true );
+}
 
 /********************** DEPRECATED FUNCTIONS **********************/
 

languages/yoast-components-ca.json

@@ -1 +1 @@
-{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;","lang":"ca"},"Choose an image":[""],"Remove the image":[""],"company logo image preview":[""],"Choose image":[""],"Mailchimp signup":[""],"MailChimp signup failed:":[""],"Sign Up!":[""],"There is an error with the request.":[""],"Select profile":[""],"Choose a profile":[""],"Authorization code":[""],"Reauthenticate with Google":[""],"To allow %s to fetch your Google Search Console information, please enter your Google Authorization Code. Clicking the button below will open a new window.":[""],"Step %1$d: %2$s":[""],"Close the Wizard":[""],"Previous step":[""],"Next step":[""],"Search Result Preview":[""],"URL preview: ":[""],"Search Result Form":[""],"SEO title preview: ":[""],"This is an example title - edit by clicking here":[""],"Slug preview: ":[""],"Meta description preview: ":[""],"Please provide a meta description by editing it here.":[""],"Close search result form":[""],"Enter your Google Authorization Code and press the Authenticate button.":["Introduïu el codi d'autorització de Google i premeu el botó «Autentica»"],"You can click on each element in the preview to jump to the Snippet Editor.":["Podeu fer clic en cada element de la previsualització per a saltar a l'editor de fragments."],"Please provide a meta description by editing the snippet below.":["Afegiu una descripció meta editant la previsualització inferior."],"Edit snippet":["Edita la previsualització"],"There were no profiles found":["No s'ha trobat cap perfil"],"Authenticate":["Autentica"],"Get Google Authorization Code":["Obté el codi d'autorització de Google"],"Previous":["Anterior"],"Email":["Adreça electrònica"],"Name":[""],"Close":["Tanca"],"Next":["Següent"]}}}
+{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;","lang":"ca"},"Choose an image":["Tria una imatge"],"Remove the image":["Suprimeix la imatge"],"company logo image preview":["previsualització del logo de l'empresa"],"Choose image":["Tria la imatge"],"Mailchimp signup":["Registre am Mailchimp"],"MailChimp signup failed:":["Ha fallat el registre al MailChimp"],"Sign Up!":["Registreu-vos!"],"There is an error with the request.":["Hi ha un error amb la petició"],"Select profile":["Selecciona un perfil"],"Choose a profile":["Tria un perfil"],"Authorization code":["Codi d'autorització"],"Reauthenticate with Google":["Reautentica amb Google"],"To allow %s to fetch your Google Search Console information, please enter your Google Authorization Code. Clicking the button below will open a new window.":["Per a permetre %s l'accés a la consola de cerca de Google, introduïu el codi d'autorització de Google. Si feu clic al botó inferior s'obrirà una nova finestra."],"Step %1$d: %2$s":["Pas %1$d: %2$s"],"Close the Wizard":["Tanca l'assistent"],"Previous step":["Pas anterior"],"Next step":["Pas següent"],"Search Result Preview":["Previsualització del resultat de cerca:"],"URL preview: ":["Previsualització de l'URL:"],"Search Result Form":["Formulari del resultat de cerca"],"SEO title preview: ":["Previsualització del títol SEO:"],"This is an example title - edit by clicking here":["Aquest és un títol d'exemple - editeu-lo fent clic aquí"],"Slug preview: ":["Previsualització del resum"],"Meta description preview: ":["Previsualització de la descripció meta:"],"Please provide a meta description by editing it here.":["Proporcioneu una descripció meta editant-la ací."],"Close search result form":["Tanca el formulari de resultats de cerca"],"Enter your Google Authorization Code and press the Authenticate button.":["Introduïu el codi d'autorització de Google i premeu el botó «Autentica»"],"You can click on each element in the preview to jump to the Snippet Editor.":["Podeu fer clic en cada element de la previsualització per a saltar a l'editor de fragments."],"Please provide a meta description by editing the snippet below.":["Afegiu una descripció meta editant la previsualització inferior."],"Edit snippet":["Edita la previsualització"],"There were no profiles found":["No s'ha trobat cap perfil"],"Authenticate":["Autentica"],"Get Google Authorization Code":["Obté el codi d'autorització de Google"],"Previous":["Anterior"],"Email":["Adreça electrònica"],"Name":[""],"Close":["Tanca"],"Next":["Següent"]}}}