4.8.9 Release

Author: flschaves

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.8
+ * Version:     4.8.9
  * Text Domain: all-in-one-seo-pack
  * Domain Path: /languages
  * License:     GPL-3.0+

app/AIOSEO.php

@@ -221,10 +221,8 @@ private function loadVersion() {
 		private function preLoad() {
 			$this->core = new Common\Core\Core();
 
-			$this->backwardsCompatibility();
-
 			// Internal Options.
-			$this->helpers                = $this->pro ? new Pro\Utils\Helpers() : new Lite\Utils\Helpers();
+			$this->helpers                = $this->pro ? new Pro\Utils\Helpers() : new Lite\Utils\Helpers(); // Needs to load before preUpdates.
 			$this->internalNetworkOptions = ( $this->pro && $this->helpers->isPluginNetworkActivated() ) ? new Pro\Options\InternalNetworkOptions() : new Common\Options\InternalNetworkOptions();
 			$this->internalOptions        = $this->pro ? new Pro\Options\InternalOptions() : new Lite\Options\InternalOptions();
 			$this->uninstall              = new Common\Main\Uninstall();
@@ -233,34 +231,6 @@ private function preLoad() {
 			$this->preUpdates = $this->pro ? new Pro\Main\PreUpdates() : new Common\Main\PreUpdates();
 		}
 
-		/**
-		 * To prevent errors and bugs from popping up,
-		 * we will run this backwards compatibility method.
-		 *
-		 * @since 4.1.9
-		 *
-		 * @return void
-		 */
-		private function backwardsCompatibility() {
-			$this->db           = $this->core->db;
-			$this->cache        = $this->core->cache;
-			$this->transients   = $this->cache;
-			$this->cachePrune   = $this->core->cachePrune;
-			$this->optionsCache = $this->core->optionsCache;
-		}
-
-		/**
-		 * To prevent errors and bugs from popping up,
-		 * we will run this backwards compatibility method.
-		 *
-		 * @since 4.2.0
-		 *
-		 * @return void
-		 */
-		private function backwardsCompatibilityLoad() {
-			$this->postSettings->integrations = $this->standalone->pageBuilderIntegrations;
-		}
-
 		/**
 		 * Load our classes.
 		 *
@@ -346,8 +316,6 @@ public function load() {
 				$this->help      = new Common\Help\Help();
 			}
 
-			$this->backwardsCompatibilityLoad();
-
 			add_action( 'init', [ $this, 'loadInit' ], 999 );
 		}
 

app/Common/Admin/Admin.php

@@ -784,6 +784,17 @@ public function hideScheduledActionsMenu() {
 			return;
 		}
 
+		// phpcs:disable WordPress.Security.NonceVerification.Recommended, HM.Security.NonceVerification.Recommended
+		// Don't hide it if we're on the Scheduled Actions menu page.
+		$page = isset( $_GET['page'] )
+			? sanitize_text_field( wp_unslash( $_GET['page'] ) )
+			: '';
+		// phpcs:enable
+
+		if ( 'action-scheduler' === $page || aioseo()->helpers->isDev() ) {
+			return;
+		}
+
 		foreach ( $submenu['tools.php'] as $index => $props ) {
 			if ( ! empty( $props[2] ) && 'action-scheduler' === $props[2] ) {
 				unset( $submenu['tools.php'][ $index ] );

app/Common/Admin/Pointers.php

@@ -82,8 +82,8 @@ public function registerPointer( $id, $pageSlug, $args ) {
 		?>
 		<script>
 			jQuery( document ).ready( function( $ ) {
-				var isClosed = false;
-				var pointer  = $( '#toplevel_page_aioseo > a' ).pointer( {
+				const $menuItem = $( '#toplevel_page_aioseo' );
+				const $pointer  = $menuItem.pointer( {
 					content :
 						"<h3><?php esc_html_e( $args['title'], 'all-in-one-seo-pack' ); ?><\/h3>" +
 						"<h4><?php esc_html_e( $args['subtitle'], 'all-in-one-seo-pack' ); ?><\/h4>" +
@@ -99,13 +99,15 @@ public function registerPointer( $id, $pageSlug, $args ) {
 						edge  : <?php echo is_rtl() ? "'right'" : "'left'"; ?>,
 						align : 'center'
 					},
-					pointerWidth : 420,
+					pointerWidth: 420,
 					show: function(event, el) {
-						el.pointer.css({'position':'fixed'});
 						el.pointer.addClass('aioseo-wp-pointer');
+						$menuItem.addClass('aioseo-pointer-active');
 					},
 					close : function() {
-						isClosed = true;
+						setTimeout(() => {
+							$menuItem.removeClass('aioseo-pointer-active');
+						}, 300);
 						jQuery.get(
 							window.location.href,
 							{
@@ -115,6 +117,8 @@ public function registerPointer( $id, $pageSlug, $args ) {
 						);
 					}
 				} ).pointer('open');
+
+				$menuItem.append($('body .wp-pointer.aioseo-wp-pointer'));
 			} );
 		</script>
 		<?php

app/Common/Ai/Ai.php

@@ -89,7 +89,7 @@ public function getAccessToken( $refresh = false ) {
 			return;
 		}
 
-		if ( aioseo()->cache->get( 'ai-access-token-error' ) ) {
+		if ( aioseo()->core->cache->get( 'ai-access-token-error' ) ) {
 			return;
 		}
 
@@ -100,7 +100,7 @@ public function getAccessToken( $refresh = false ) {
 		] );
 
 		if ( is_wp_error( $response ) ) {
-			aioseo()->cache->update( 'ai-access-token-error', true, 1 * HOUR_IN_SECONDS );
+			aioseo()->core->cache->update( 'ai-access-token-error', true, 1 * HOUR_IN_SECONDS );
 
 			// Schedule another, one-time event in approx. 1 hour from now.
 			aioseo()->actionScheduler->scheduleSingle( $this->creditFetchAction, 1 * ( HOUR_IN_SECONDS + wp_rand( 0, 30 * MINUTE_IN_SECONDS ) ), [] );
@@ -111,7 +111,7 @@ public function getAccessToken( $refresh = false ) {
 		$body = wp_remote_retrieve_body( $response );
 		$data = json_decode( $body );
 		if ( empty( $data->accessToken ) ) {
-			aioseo()->cache->update( 'ai-access-token-error', true, 1 * HOUR_IN_SECONDS );
+			aioseo()->core->cache->update( 'ai-access-token-error', true, 1 * HOUR_IN_SECONDS );
 
 			// Schedule another, one-time event in approx. 1 hour from now.
 			aioseo()->actionScheduler->scheduleSingle( $this->creditFetchAction, 1 * ( HOUR_IN_SECONDS + wp_rand( 0, 30 * MINUTE_IN_SECONDS ) ), [] );
@@ -152,7 +152,7 @@ public function scheduleCreditFetchAction() {
 	 * @return void
 	 */
 	public function updateCredits( $refresh = false ) {
-		if ( aioseo()->cache->get( 'ai-credits-error' ) && ! $refresh ) {
+		if ( aioseo()->core->cache->get( 'ai-credits-error' ) && ! $refresh ) {
 			return;
 		}
 
@@ -165,7 +165,7 @@ public function updateCredits( $refresh = false ) {
 		] );
 
 		if ( is_wp_error( $response ) ) {
-			aioseo()->cache->update( 'ai-credits-error', true, HOUR_IN_SECONDS );
+			aioseo()->core->cache->update( 'ai-credits-error', true, HOUR_IN_SECONDS );
 
 			// Schedule another, one-time event in approx. 1 hour from now.
 			aioseo()->actionScheduler->scheduleSingle( $this->creditFetchAction, 1 * ( HOUR_IN_SECONDS + wp_rand( 0, 30 * MINUTE_IN_SECONDS ) ), [] );
@@ -181,7 +181,7 @@ public function updateCredits( $refresh = false ) {
 				aioseo()->internalOptions->internal->ai->accessToken = '';
 			}
 
-			aioseo()->cache->update( 'ai-credits-error', true, HOUR_IN_SECONDS );
+			aioseo()->core->cache->update( 'ai-credits-error', true, HOUR_IN_SECONDS );
 
 			// Schedule another, one-time event in approx. 1 hour from now.
 			aioseo()->actionScheduler->scheduleSingle( $this->creditFetchAction, 1 * ( HOUR_IN_SECONDS + wp_rand( 0, 30 * MINUTE_IN_SECONDS ) ), [] );

app/Common/Ai/Image.php

@@ -30,6 +30,26 @@ public function __construct() {
 		add_action( $this->generateImageMetadataHook, [ $this, 'generateImageMetadata' ], 10, 2 );
 	}
 
+	/**
+	 * Returns the data for Vue.
+	 *
+	 * @since 4.8.9
+	 *
+	 * @param  int|null $objectId The object ID.
+	 * @return array              The data.
+	 */
+	public function getVueDataEdit( $objectId = null ) {
+		$objectId = $objectId ?: absint( get_the_ID() );
+
+		return [
+			'extend' => [
+				'imageBlockToolbar'     => apply_filters( 'aioseo_ai_image_generator_extend_image_block_toolbar', true, $objectId ),
+				'imageBlockPlaceholder' => apply_filters( 'aioseo_ai_image_generator_extend_image_block_placeholder', true, $objectId ),
+				'featuredImageButton'   => apply_filters( 'aioseo_ai_image_generator_extend_featured_image_button', true, $objectId ),
+			]
+		];
+	}
+
 	/**
 	 * Creates a WordPress attachment from base64 image data.
 	 *

app/Common/Api/Api.php

@@ -365,7 +365,7 @@ protected function getRouteData( $request ) {
 		if ( empty( $routeData ) ) {
 			foreach ( $this->getRoutes()[ $request->get_method() ] as $routeRegex => $routeInfo ) {
 				$routeRegex = str_replace( '@', '\@', $routeRegex );
-				if ( preg_match( "@{$routeRegex}@", (string) $route ) ) {
+				if ( preg_match( "@^{$routeRegex}$@", (string) $route ) ) {
 					$routeData = $routeInfo;
 					break;
 				}

app/Common/Api/Settings.php

@@ -451,10 +451,10 @@ public static function prepareCSVImport( $fileContent ) {
 			'postOptions' => null
 		];
 
-		$rows = str_getcsv( $fileContent, "\n" );
+		$rows = str_getcsv( $fileContent, "\n", '"', '\\' );
 
 		// Get the first row to check if the file has post_id or term_id.
-		$header = str_getcsv( $rows[0], ',' );
+		$header = str_getcsv( $rows[0], ',', '"', '\\' );
 		$header = aioseo()->helpers->sanitizeOption( $header );
 
 		// Check if the file has post_id or term_id.
@@ -482,7 +482,7 @@ public static function prepareCSVImport( $fileContent ) {
 
 		foreach ( $rows as $row ) {
 			$row = str_replace( '\\""', '\\"', $row );
-			$row = str_getcsv( $row, ',' );
+			$row = str_getcsv( $row, ',', '"', '\\' );
 
 			foreach ( $row as $key => $value ) {
 				$key = aioseo()->helpers->sanitizeOption( $key );
@@ -769,7 +769,7 @@ public static function doTask( $request ) {
 				break;
 			case 'reset-data':
 				aioseo()->uninstall->dropData( true );
-				aioseo()->internalOptions->database->installedTables = '';
+				aioseo()->core->cache->delete( 'db_schema' );
 				aioseo()->internalOptions->internal->lastActiveVersion = '4.0.0';
 				aioseo()->internalOptions->save( true );
 				aioseo()->updates->addInitialCustomTablesForV4();
@@ -780,12 +780,12 @@ public static function doTask( $request ) {
 				break;
 			// Migrations
 			case 'rerun-migrations':
-				aioseo()->internalOptions->database->installedTables   = '';
+				aioseo()->core->cache->delete( 'db_schema' );
 				aioseo()->internalOptions->internal->lastActiveVersion = '4.0.0';
 				aioseo()->internalOptions->save( true );
 				break;
 			case 'rerun-addon-migrations':
-				aioseo()->internalOptions->database->installedTables = '';
+				aioseo()->core->cache->delete( 'db_schema' );
 
 				foreach ( $data as $sku ) {
 					$convertedSku = aioseo()->helpers->dashesToCamelCase( $sku );

app/Common/Breadcrumbs/Block.php

@@ -172,7 +172,8 @@ private function getBlockOverrides() {
 		$default = filter_var( $this->breadcrumbSettings['default'], FILTER_VALIDATE_BOOLEAN );
 		if ( true === $default || ! aioseo()->pro ) {
 			return [
-				'postTitle' => ! empty( $this->postTitle ) ? $this->postTitle : null
+				'postTitle'   => ! empty( $this->postTitle ) ? $this->postTitle : null,
+				'primaryTerm' => ! empty( $this->primaryTerm[ $this->breadcrumbSettings['taxonomy'] ] ) ? $this->primaryTerm[ $this->breadcrumbSettings['taxonomy'] ] : null
 			];
 		}
 

app/Common/Breadcrumbs/Frontend.php

@@ -98,7 +98,7 @@ public function getBreadcrumbs() {
 
 			if ( is_search() ) {
 				$type      = 'search';
-				$reference = htmlspecialchars( sanitize_text_field( get_search_query() ) );
+				$reference = htmlspecialchars( sanitize_text_field( get_search_query() ), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 );
 			}
 
 			if ( is_404() ) {
@@ -245,7 +245,7 @@ protected function breadcrumbToDisplay( $item ) {
 			function ( $matches ) {
 				return '>' . $matches[1] . '>';
 			},
-			htmlentities( $templateItem['template'] )
+			htmlentities( $templateItem['template'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 )
 		);
 
 		// Restore html.