4.8.5 Release

Author: arnaudbroes

all_in_one_seo_pack.php

@@ -5,7 +5,7 @@
  * Description: SEO for WordPress. Features like XML Sitemaps, SEO for custom post types, SEO for blogs, business sites, ecommerce sites, and much more. More than 100 million downloads since 2007.
  * Author:      All in One SEO Team
  * Author URI:  https://aioseo.com/
- * Version:     4.8.4.1
+ * Version:     4.8.5
  * Text Domain: all-in-one-seo-pack
  * Domain Path: /languages
  * License:     GPL-3.0+
@@ -60,7 +60,7 @@
 // We require WordPress 5.4+ for the whole plugin to work.
 // Support for 5.4, 5.5 and 5.6 will be dropped at the end of 2025.
 global $wp_version; // phpcs:ignore Squiz.NamingConventions.ValidVariableName
-if ( version_compare( $wp_version, '5.4', '<' ) ) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName
+if ( version_compare( $wp_version, '5.7', '<' ) ) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName
 	add_action( 'admin_notices', 'aioseo_wordpress_notice' );
 
 	// Do not process the plugin code further.

app/Common/Ai/Ai.php

@@ -149,6 +149,11 @@ public function updateCredits( $refresh = false ) {
 		$body = wp_remote_retrieve_body( $response );
 		$data = json_decode( $body );
 		if ( empty( $data->success ) ) {
+			if ( ! empty( $data->code ) && 'invalid-token' === $data->code ) {
+				// Drop the access token in case it could not be found.
+				aioseo()->internalOptions->internal->ai->accessToken = '';
+			}
+
 			aioseo()->cache->update( 'ai-credits-error', true, HOUR_IN_SECONDS );
 
 			// Schedule another, one-time event in approx. 1 hour from now.

app/Common/Api/PostsTerms.php

@@ -296,7 +296,6 @@ public static function updatePostDetailsColumn( $request ) {
 		}
 
 		$aioseoPost = Models\Post::getPost( $postId );
-		$aioseoData = json_decode( wp_json_encode( $aioseoPost ), true );
 
 		if ( $isMedia ) {
 			wp_update_post(
@@ -308,7 +307,13 @@ public static function updatePostDetailsColumn( $request ) {
 			update_post_meta( $postId, '_wp_attachment_image_alt', sanitize_text_field( $body['imageAltTag'] ) );
 		}
 
-		Models\Post::savePost( $postId, array_replace( $aioseoData, $body ) );
+		$aioseoPost->title       = $body['title'];
+		$aioseoPost->description = $body['description'];
+		$aioseoPost->updated     = gmdate( 'Y-m-d H:i:s' );
+		$aioseoPost->save();
+
+		// Trigger the action hook so we can create a revision.
+		do_action( 'aioseo_insert_post', $postId );
 
 		$lastError = aioseo()->core->db->lastError();
 		if ( ! empty( $lastError ) ) {

app/Common/Api/Settings.php

@@ -25,17 +25,26 @@ class Settings {
 	public static $importFile = [];
 
 	/**
-	 * Update the settings.
+	 * Retrieves the plugin options.
 	 *
 	 * @since 4.0.0
 	 *
-	 * @return \WP_REST_Response The response.
+	 * @param  \WP_REST_Request  $request The REST Request.
+	 * @return \WP_REST_Response          The response containing all plugin options.
 	 */
-	public static function getOptions() {
-		return new \WP_REST_Response( [
-			'options'  => aioseo()->options->all(),
-			'settings' => aioseo()->settings->all()
-		], 200 );
+	public static function getOptions( $request ) {
+		$siteId = (int) $request->get_param( 'siteId' );
+		if ( $siteId ) {
+			aioseo()->helpers->switchToBlog( $siteId );
+
+			// Re-initialize the options for this site.
+			aioseo()->options->init();
+		}
+
+		return new \WP_REST_Response([
+			'success' => true,
+			'options' => aioseo()->options->all()
+		], 200);
 	}
 
 	/**

app/Common/Core/Core.php

@@ -37,8 +37,13 @@ class Core {
 		'aioseo_redirects_logs',
 		'aioseo_terms',
 		'aioseo_search_statistics_objects',
+		'aioseo_search_statistics_keywords',
+		'aioseo_search_statistics_keyword_groups',
+		'aioseo_search_statistics_keyword_relationships',
 		'aioseo_revisions',
-		'aioseo_seo_analyzer_results'
+		'aioseo_seo_analyzer_results',
+		'aioseo_writing_assistant_keywords',
+		'aioseo_writing_assistant_posts'
 	];
 
 	/**

app/Common/Main/Uninstall.php

@@ -40,6 +40,11 @@ public function dropData( $force = false ) {
 
 		// Delete all our custom capabilities.
 		$this->uninstallCapabilities();
+
+		// Delete data for the addons.
+		aioseo()->addons->doAddonFunction( 'uninstall', 'dropData', [
+			'force' => $force
+		] );
 	}
 
 	/**

app/Common/Schema/Graphs/BreadcrumbList.php

@@ -26,10 +26,12 @@ public function get() {
 		}
 
 		// Set the position for each breadcrumb.
+		$position = 1;
 		foreach ( $breadcrumbs as $k => $breadcrumb ) {
 			if ( ! isset( $breadcrumb['position'] ) ) {
-				$breadcrumbs[ $k ]['position'] = $k + 1;
+				$breadcrumbs[ $k ]['position'] = $position;
 			}
+			$position++;
 		}
 
 		$trailLength = count( $breadcrumbs );
@@ -39,7 +41,7 @@ public function get() {
 
 		$listItems = [];
 		foreach ( $breadcrumbs as $breadcrumb ) {
-			if ( empty( $breadcrumb['link'] ) ) {
+			if ( empty( $breadcrumb['link'] ) || ! is_scalar( $breadcrumb['link'] ) ) {
 				continue;
 			}
 

app/Common/SearchStatistics/Site.php

@@ -62,15 +62,10 @@ public function worker() {
 		}
 
 		$siteStatus = $this->checkStatus();
-		if ( empty( $siteStatus ) ) {
-			// If it failed to communicate with the server, try again in a few hours.
-			aioseo()->actionScheduler->scheduleSingle( $this->action, wp_rand( HOUR_IN_SECONDS, 2 * HOUR_IN_SECONDS ), [], true );
-
-			return;
+		if ( ! empty( $siteStatus ) ) {
+			$this->processStatus( $siteStatus );
 		}
 
-		$this->processStatus( $siteStatus );
-
 		// Schedule a new check for the next week.
 		aioseo()->actionScheduler->scheduleSingle( $this->action, WEEK_IN_SECONDS + wp_rand( 0, 3 * DAY_IN_SECONDS ), [], true );
 	}

app/Common/SearchStatistics/Sitemap.php

@@ -65,16 +65,11 @@ public function worker() {
 		$api      = new Api\Request( 'google-search-console/sitemap/sync/', [ 'sitemaps' => aioseo()->sitemap->helpers->getSitemapUrls() ] );
 		$response = $api->request();
 
-		if ( is_wp_error( $response ) || empty( $response['data'] ) ) {
-			// If it failed to communicate with the server, try again in a few hours.
-			aioseo()->actionScheduler->scheduleSingle( $this->action, wp_rand( HOUR_IN_SECONDS, 2 * HOUR_IN_SECONDS ), [], true );
-
-			return;
+		if ( ! is_wp_error( $response ) && ! empty( $response['data'] ) ) {
+			aioseo()->internalOptions->searchStatistics->sitemap->list      = $response['data'];
+			aioseo()->internalOptions->searchStatistics->sitemap->lastFetch = time();
 		}
 
-		aioseo()->internalOptions->searchStatistics->sitemap->list      = $response['data'];
-		aioseo()->internalOptions->searchStatistics->sitemap->lastFetch = time();
-
 		// Schedule a new sync for the next week.
 		aioseo()->actionScheduler->scheduleSingle( $this->action, WEEK_IN_SECONDS + wp_rand( 0, 3 * DAY_IN_SECONDS ), [], true );
 	}

app/Common/Traits/Helpers/Url.php

@@ -217,7 +217,7 @@ private function isValidDomain( $domain ) {
 	 */
 	private function isDomainWithPaths( $domain ) {
 		// In case there are unicode characters, convert it into IDNA ASCII URLs.
-		if ( function_exists( 'idn_to_ascii' ) ) {
+		if ( $domain && function_exists( 'idn_to_ascii' ) ) {
 			$domain = idn_to_ascii( $domain, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46 );
 		}
 
@@ -390,15 +390,14 @@ public function makeUrlRelative( $url ) {
 	 */
 	public function makeUrlAbsolute( $url ) {
 		if ( 0 !== strpos( $url, 'http' ) && '/' !== $url ) {
-			$url = $this->sanitizeDomain( $url );
-			if ( $this->isDomainWithPaths( $url ) ) {
-				$scheme = wp_parse_url( site_url(), PHP_URL_SCHEME );
-				$url    = $scheme . '://' . $url;
-			} elseif ( 0 === strpos( $url, '//' ) ) {
-				$scheme = wp_parse_url( site_url(), PHP_URL_SCHEME );
-				$url    = $scheme . ':' . $url;
+			$scheme   = wp_parse_url( site_url(), PHP_URL_SCHEME );
+			$cleanUrl = untrailingslashit( preg_replace( '#^https?://#i', '', trim( $url ) ) );
+			if ( $this->isDomainWithPaths( $cleanUrl ) ) {
+				$url = $scheme . '://' . $cleanUrl;
+			} elseif ( 0 === strpos( $cleanUrl, '//' ) ) {
+				$url = $scheme . ':' . $cleanUrl;
 			} else {
-				$url = site_url( $url );
+				$url = site_url( $cleanUrl );
 			}
 		}