Merge branch 'main' into develop.

google · Aug 23, 2023 · 6ed71da · 6ed71da
2 parents 0fe2e0f + 98f8c8a
commit 6ed71da
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/assets/js/googlesitekit/datastore/site/info.js b/assets/js/googlesitekit/datastore/site/info.js
@@ -111,7 +111,7 @@ export const actions = {
 	/**
 	 * Sets the `keyMetricsSetupCompleted` boolean value.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 *
 	 * @param {boolean} keyMetricsSetupCompleted Whether key metrics setup is completed.
 	 * @return {Object} Redux-style action.
@@ -811,7 +811,7 @@ export const selectors = {
 	 * Checks if the Key Metrics widget has been setup either if at least one user
 	 * has answered the User Input questionnaire or picked their own metrics.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 *
 	 * @return {(boolean)} `true` if the Key Metrics widget has been setup, otherwise `false`.
 	 */

diff --git a/google-site-kit.php b/google-site-kit.php
@@ -11,7 +11,7 @@
  * Plugin Name:       Site Kit by Google
  * Plugin URI:        https://sitekit.withgoogle.com
  * Description:       Site Kit is a one-stop solution for WordPress users to use everything Google has to offer to make them successful on the web.
- * Version:           1.107.0
+ * Version:           1.108.0
  * Requires at least: 5.2
  * Requires PHP:      5.6
  * Author:            Google
@@ -26,7 +26,7 @@
 }
 
 // Define most essential constants.
-define( 'GOOGLESITEKIT_VERSION', '1.107.0' );
+define( 'GOOGLESITEKIT_VERSION', '1.108.0' );
 define( 'GOOGLESITEKIT_PLUGIN_MAIN_FILE', __FILE__ );
 define( 'GOOGLESITEKIT_PHP_MINIMUM', '5.6.0' );
 define( 'GOOGLESITEKIT_WP_MINIMUM', '5.2.0' );

diff --git a/includes/Context.php b/includes/Context.php
@@ -30,7 +30,7 @@ class Context {
 	 *
 	 * @since 1.0.0 Originally introduced.
 	 * @since 1.36.0 Marked as unused, see description.
-	 * @since n.e.x.t Removed the description and reinstated.
+	 * @since 1.108.0 Removed the description and reinstated.
 	 * @var string
 	 */
 	const AMP_MODE_PRIMARY = 'primary';
@@ -315,7 +315,7 @@ public function is_amp() {
 	 * Gets the current AMP mode.
 	 *
 	 * @since 1.0.0
-	 * @since n.e.x.t Extracted AMP plugin related logic to `get_amp_mode_from_amp_plugin` function.
+	 * @since 1.108.0 Extracted AMP plugin related logic to `get_amp_mode_from_amp_plugin` function.
 	 *
 	 * @return bool|string 'primary' if in standard mode,
 	 *                     'secondary' if in transitional or reader modes, or the Web Stories plugin is active
@@ -338,7 +338,7 @@ public function get_amp_mode() {
 	/**
 	 * Gets the current AMP mode from the AMP plugin.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 *
 	 * @return bool|string 'primary' if in standard mode,
 	 *                     'secondary' if in transitional or reader modes

diff --git a/includes/Core/Key_Metrics/Key_Metrics.php b/includes/Core/Key_Metrics/Key_Metrics.php
@@ -37,7 +37,7 @@ class Key_Metrics {
 	/**
 	 * Key_Metrics_Setup_Completed instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 * @var Key_Metrics_Setup_Completed
 	 */
 	protected $key_metrics_setup_completed;
@@ -81,7 +81,7 @@ public function register() {
 	/**
 	 * Adds the status of the Key Metrics widget setup to the inline JS data.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 *
 	 * @param array $data Inline JS data.
 	 * @return array Filtered $data.

diff --git a/includes/Core/Key_Metrics/Key_Metrics_Setup_Completed.php b/includes/Core/Key_Metrics/Key_Metrics_Setup_Completed.php
@@ -15,7 +15,7 @@
 /**
  * Class for handling the setup completion state of Key Metrics.
  *
- * @since n.e.x.t
+ * @since 1.108.0
  * @access private
  * @ignore
  */
@@ -29,7 +29,7 @@ class Key_Metrics_Setup_Completed extends Setting {
 	/**
 	 * Gets the expected value type.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 *
 	 * @return string The type name.
 	 */

diff --git a/includes/Core/Key_Metrics/REST_Key_Metrics_Controller.php b/includes/Core/Key_Metrics/REST_Key_Metrics_Controller.php
@@ -38,7 +38,7 @@ class REST_Key_Metrics_Controller {
 	/**
 	 * Key_Metrics_Setup_Completed instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 * @var Key_Metrics_Setup_Completed
 	 */
 	protected $key_metrics_setup_completed;

diff --git a/includes/Core/REST_API/REST_Routes.php b/includes/Core/REST_API/REST_Routes.php
@@ -66,7 +66,7 @@ function( $vars ) use ( $wp ) {
 						// arguments.
 
 						$unset_vars = ( $wp->request && stripos( $wp->request, trailingslashit( rest_get_url_prefix() ) . self::REST_ROOT ) !== false ) // Check regular permalinks.
-							|| ( empty( $wp->request ) && stripos( $this->context->input()->filter( INPUT_GET, 'rest_route' ), self::REST_ROOT ) !== false ); // Check plain permalinks.
+							|| ( empty( $wp->request ) && stripos( $this->context->input()->filter( INPUT_GET, 'rest_route' ) || '', self::REST_ROOT ) !== false ); // Check plain permalinks.
 
 						if ( $unset_vars ) {
 							// List of variable names to remove from public query variables list.

diff --git a/includes/Core/User_Input/REST_User_Input_Controller.php b/includes/Core/User_Input/REST_User_Input_Controller.php
@@ -49,7 +49,7 @@ class REST_User_Input_Controller {
 	/**
 	 * Key_Metrics_Setup_Completed instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.108.0
 	 * @var Key_Metrics_Setup_Completed
 	 */
 	protected $key_metrics_setup_completed;