From cfa675ca97dd9c36d4540e099f1f5203fe83eede Mon Sep 17 00:00:00 2001
From: Dan <dstein64@users.noreply.github.com>
Date: Sun, 19 May 2019 12:14:25 -0400
Subject: [PATCH 1/6] Add $wp->request to add_query_arg.

---
 modules/minileven/minileven.php               | 18 ++++++++++++-
 .../minileven/theme/pub/minileven/footer.php  | 25 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index abfec53d523f9..f36143d424aff 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -117,7 +117,23 @@ function jetpack_mobile_template( $theme ) {
 }
 
 function jetpack_mobile_available() {
-	echo '<div class="jetpack-mobile-link" style="text-align:center;margin:10px 0;"><a href="'. esc_url( home_url( add_query_arg('ak_action', 'accept_mobile') ) ) . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a></div>';
+	global $wp;
+	$url_params = array(
+		'ak_action' => 'accept_mobile',
+	);
+	if ( is_array( $_GET ) && ! empty( $_GET ) ) {
+		$url_params[] = $_GET;
+	}
+	$target_url = esc_url(
+		home_url(
+			add_query_arg(
+				$url_params,
+				$wp->request
+			)
+		)
+	);
+	$anchor = '<a href="' . $target_url . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a>';
+	echo '<div class="jetpack-mobile-link" style="text-align:center;margin:10px 0;">' . $anchor . '</div>';
 }
 
 function jetpack_mobile_request_handler() {
diff --git a/modules/minileven/theme/pub/minileven/footer.php b/modules/minileven/theme/pub/minileven/footer.php
index 964165f0f8a57..6bdf7fed029a3 100644
--- a/modules/minileven/theme/pub/minileven/footer.php
+++ b/modules/minileven/theme/pub/minileven/footer.php
@@ -27,7 +27,30 @@
 
 <footer id="colophon" role="contentinfo">
 	<div id="site-generator">
-		<a href="<?php echo esc_url( home_url( add_query_arg('ak_action', 'reject_mobile') ) ); ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a><br />
+
+		<?php
+			/*
+			 * Construct "$target_url", which adds "ak_action=reject_mobile"
+			 * to the current URL.
+			 */
+			global $wp;
+			$url_params = array(
+				'ak_action' => 'reject_mobile',
+			);
+			if ( is_array( $_GET ) && ! empty( $_GET ) ) {
+				$url_params[] = $_GET;
+			}
+			$target_url = esc_url(
+				home_url(
+					add_query_arg(
+						$url_params,
+						$wp->request
+					)
+				)
+			);
+		?>
+
+		<a href="<?php echo $target_url; ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a><br />
 
 		<?php
 			/**

From b726f312234068daeb12016dc21aa1ca004effa7 Mon Sep 17 00:00:00 2001
From: Dan <dstein64@users.noreply.github.com>
Date: Sun, 19 May 2019 12:46:45 -0400
Subject: [PATCH 2/6] Join lines.

---
 modules/minileven/minileven.php                  | 8 ++------
 modules/minileven/theme/pub/minileven/footer.php | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index f36143d424aff..f1d850dfa77a0 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -124,14 +124,10 @@ function jetpack_mobile_available() {
 	if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 		$url_params[] = $_GET;
 	}
-	$target_url = esc_url(
-		home_url(
-			add_query_arg(
+	$target_url = esc_url(home_url(add_query_arg(
 				$url_params,
 				$wp->request
-			)
-		)
-	);
+			)));
 	$anchor = '<a href="' . $target_url . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a>';
 	echo '<div class="jetpack-mobile-link" style="text-align:center;margin:10px 0;">' . $anchor . '</div>';
 }
diff --git a/modules/minileven/theme/pub/minileven/footer.php b/modules/minileven/theme/pub/minileven/footer.php
index 6bdf7fed029a3..2957571a8243e 100644
--- a/modules/minileven/theme/pub/minileven/footer.php
+++ b/modules/minileven/theme/pub/minileven/footer.php
@@ -41,13 +41,9 @@
 				$url_params[] = $_GET;
 			}
 			$target_url = esc_url(
-				home_url(
-					add_query_arg(
-						$url_params,
+				home_url(add_query_arg($url_params,
 						$wp->request
-					)
-				)
-			);
+					)));
 		?>
 
 		<a href="<?php echo $target_url; ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a><br />

From bd040bff133081c00ccb48bb5e511909a802d593 Mon Sep 17 00:00:00 2001
From: Dan <dstein64@users.noreply.github.com>
Date: Sun, 19 May 2019 12:50:01 -0400
Subject: [PATCH 3/6] Join lines further.

---
 modules/minileven/minileven.php                  | 5 +----
 modules/minileven/theme/pub/minileven/footer.php | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index f1d850dfa77a0..c4d4c4061a63f 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -124,10 +124,7 @@ function jetpack_mobile_available() {
 	if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 		$url_params[] = $_GET;
 	}
-	$target_url = esc_url(home_url(add_query_arg(
-				$url_params,
-				$wp->request
-			)));
+	$target_url = esc_url(home_url(add_query_arg($url_params, $wp->request)));
 	$anchor = '<a href="' . $target_url . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a>';
 	echo '<div class="jetpack-mobile-link" style="text-align:center;margin:10px 0;">' . $anchor . '</div>';
 }
diff --git a/modules/minileven/theme/pub/minileven/footer.php b/modules/minileven/theme/pub/minileven/footer.php
index 2957571a8243e..124d4d245b44e 100644
--- a/modules/minileven/theme/pub/minileven/footer.php
+++ b/modules/minileven/theme/pub/minileven/footer.php
@@ -40,10 +40,7 @@
 			if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 				$url_params[] = $_GET;
 			}
-			$target_url = esc_url(
-				home_url(add_query_arg($url_params,
-						$wp->request
-					)));
+			$target_url = esc_url(home_url(add_query_arg($url_params, $wp->request)));
 		?>
 
 		<a href="<?php echo $target_url; ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a><br />

From ee884123e8afa45ba7ff39986a0e94e9cdf3e636 Mon Sep 17 00:00:00 2001
From: Dan <dstein64@users.noreply.github.com>
Date: Sun, 19 May 2019 12:59:02 -0400
Subject: [PATCH 4/6] Add function documentation.

---
 modules/minileven/minileven.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index c4d4c4061a63f..6fbd152da3f9d 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -117,6 +117,10 @@ function jetpack_mobile_template( $theme ) {
 }
 
 function jetpack_mobile_available() {
+	/*
+	 * Create HTML markup with a link to "View Mobile Site".
+	 * The link adds "ak_action=accept_mobile" to the current URL.
+	 */
 	global $wp;
 	$url_params = array(
 		'ak_action' => 'accept_mobile',

From 95ebf2a54705e6d8ed474d3b76d9b607dd633bae Mon Sep 17 00:00:00 2001
From: Dan <dstein64@users.noreply.github.com>
Date: Sun, 19 May 2019 21:30:34 -0400
Subject: [PATCH 5/6] Add more spaces.

This matches the formatting of surrounding code.
---
 modules/minileven/minileven.php                  | 2 +-
 modules/minileven/theme/pub/minileven/footer.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index 6fbd152da3f9d..88bfc7681163c 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -128,7 +128,7 @@ function jetpack_mobile_available() {
 	if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 		$url_params[] = $_GET;
 	}
-	$target_url = esc_url(home_url(add_query_arg($url_params, $wp->request)));
+	$target_url = esc_url( home_url( add_query_arg( $url_params, $wp->request ) ) );
 	$anchor = '<a href="' . $target_url . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a>';
 	echo '<div class="jetpack-mobile-link" style="text-align:center;margin:10px 0;">' . $anchor . '</div>';
 }
diff --git a/modules/minileven/theme/pub/minileven/footer.php b/modules/minileven/theme/pub/minileven/footer.php
index 124d4d245b44e..ccea313da114c 100644
--- a/modules/minileven/theme/pub/minileven/footer.php
+++ b/modules/minileven/theme/pub/minileven/footer.php
@@ -40,7 +40,7 @@
 			if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 				$url_params[] = $_GET;
 			}
-			$target_url = esc_url(home_url(add_query_arg($url_params, $wp->request)));
+			$target_url = esc_url( home_url( add_query_arg( $url_params, $wp->request ) ) );
 		?>
 
 		<a href="<?php echo $target_url; ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a><br />

From a10b3c2da1f7bd870775b76bfb7d4991bf7fe264 Mon Sep 17 00:00:00 2001
From: Dan <dstein64@users.noreply.github.com>
Date: Mon, 20 May 2019 17:22:04 -0400
Subject: [PATCH 6/6] Escape as late as possible.

---
 modules/minileven/minileven.php                  | 4 ++--
 modules/minileven/theme/pub/minileven/footer.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index 88bfc7681163c..c7ab05e2e1a04 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -128,8 +128,8 @@ function jetpack_mobile_available() {
 	if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 		$url_params[] = $_GET;
 	}
-	$target_url = esc_url( home_url( add_query_arg( $url_params, $wp->request ) ) );
-	$anchor = '<a href="' . $target_url . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a>';
+	$target_url = home_url( add_query_arg( $url_params, $wp->request ) );
+	$anchor = '<a href="' . esc_url( $target_url ) . '">' . __( 'View Mobile Site', 'jetpack' ) . '</a>';
 	echo '<div class="jetpack-mobile-link" style="text-align:center;margin:10px 0;">' . $anchor . '</div>';
 }
 
diff --git a/modules/minileven/theme/pub/minileven/footer.php b/modules/minileven/theme/pub/minileven/footer.php
index ccea313da114c..bab105bf67dd5 100644
--- a/modules/minileven/theme/pub/minileven/footer.php
+++ b/modules/minileven/theme/pub/minileven/footer.php
@@ -40,10 +40,11 @@
 			if ( is_array( $_GET ) && ! empty( $_GET ) ) {
 				$url_params[] = $_GET;
 			}
-			$target_url = esc_url( home_url( add_query_arg( $url_params, $wp->request ) ) );
+			$target_url = home_url( add_query_arg( $url_params, $wp->request ) );
 		?>
 
-		<a href="<?php echo $target_url; ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a><br />
+		<a href="<?php echo esc_url( $target_url ); ?>"><?php _e( 'View Full Site', 'jetpack' ); ?></a>
+		<br />
 
 		<?php
 			/**