From df85c9f360ba7f03c5932ea2a653f66962702cda Mon Sep 17 00:00:00 2001
From: Justin Foell <630830+jrfoell@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:24:37 -0600
Subject: [PATCH 1/2] Remove map link when doing REST request

---
 readme.txt                |  3 ++-
 src/WPStrava/Activity.php | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 0e48f13..f791b3a 100755
--- a/readme.txt
+++ b/readme.txt
@@ -113,12 +113,13 @@ On the WP-Strava settings page you cannot currently remove and add another athle
 == Changelog ==
 
 
-= Unreleased =
+= 2.5.1 =
 
 Fix latest_map class replacing echo with return https://wordpress.org/support/topic/latest-activity-map-shortcode-wrong-placed-on-page/
 Fix styling on pace activity max speed.
 Fix broken water pace on activity.
 Fix pace types and remove 'other' - making 'speed' default.
+Fix to remove map link in editor so you don't leave the editor.
 
 = 2.5.0 =
 
diff --git a/src/WPStrava/Activity.php b/src/WPStrava/Activity.php
index 9623874..242792f 100755
--- a/src/WPStrava/Activity.php
+++ b/src/WPStrava/Activity.php
@@ -109,11 +109,22 @@ class WPStrava_Activity {
 	 * @since  2.3.2
 	 */
 	public function get_activity_link( $activity_id, $text, $title = '' ) {
-		if ( WPStrava::get_instance()->settings->no_link ) {
+		if ( $this->is_rest_request() || WPStrava::get_instance()->settings->no_link ) {
 			return $text;
 		}
 		$url        = esc_url( self::ACTIVITIES_URL . $activity_id );
 		$title_attr = $title ? " title='" . esc_attr( $title ) . "'" : '';
 		return "<a href='{$url}'{$title_attr}>{$text}</a>";
 	}
+
+	/**
+	 * Check if rest request to skip link rendering in block editor.
+	 *
+	 * @return boolean
+	 * @author Justin Foell <justin@foell.org>
+	 * @since  2.5.1
+	 */
+	private function is_rest_request() {
+		return defined( 'REST_REQUEST' ) && REST_REQUEST;
+	}
 }

From a3a5139a8594dfdfc677e590026c79207af942ac Mon Sep 17 00:00:00 2001
From: Justin Foell <630830+jrfoell@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:24:54 -0600
Subject: [PATCH 2/2] Bump versions to 2.5.1

---
 readme.txt    | 2 +-
 wp-strava.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index f791b3a..69b6a58 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Contributors: cmanon, jrfoell, lancewillett, dlintott, sebastianerb
 Tags: strava, activity, bicycle, cycling, biking, running, run, swimming, swim, paddle, kayak, gps, shortcode, widget, plugin
 Requires at least: 4.6
 Tested up to: 5.5
-Stable tag: 2.5.0
+Stable tag: 2.5.1
 Requires PHP: 5.3
 License: GPLv2 or later
 
diff --git a/wp-strava.php b/wp-strava.php
index e69507e..dd94dff 100755
--- a/wp-strava.php
+++ b/wp-strava.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Strava
  * Plugin URI: https://wordpress.org/plugins/wp-strava/
  * Description: Show your strava.com activity on your WordPress site. Some Icons are Copyright © Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 license.
- * Version: 2.5.0
+ * Version: 2.5.1
  * Author: Carlos Santa Cruz, Justin Foell, Lance Willett, Daniel Lintott, Sebastian Erb
  * License: GPL2
  * Text Domain: wp-strava
@@ -27,7 +27,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-define( 'WPSTRAVA_PLUGIN_VERSION', '2.5.0' );
+define( 'WPSTRAVA_PLUGIN_VERSION', '2.5.1' );
 define( 'WPSTRAVA_PLUGIN_FILE', __FILE__ );
 define( 'WPSTRAVA_PLUGIN_DIR', trailingslashit( dirname( __FILE__ ) ) );
 define( 'WPSTRAVA_PLUGIN_URL', plugins_url( '/', __FILE__ ) );