Sync: Factor out logic to get raw URL; Do not set scheme

Author: ebinnion

sync/class.jetpack-sync-functions.php

@@ -144,17 +144,28 @@ public static function file_system_write_access() {
 		return false;
 	}
 
-	public static function home_url() {
+	/**
+	 * Helper function that is used when getting home or siteurl values. Decides
+	 * whether to get the raw or filtered value.
+	 *
+	 * @return string
+	 */
+	public static function get_raw_or_filtered_url( $url_type, $url_function) {
 		if (
 			! Jetpack_Constants::is_defined( 'JETPACK_SYNC_USE_RAW_URL' ) ||
 			Jetpack_Constants::get_constant( 'JETPACK_SYNC_USE_RAW_URL' )
 		) {
-			$home_url = self::get_raw_url( 'home' );
+			$url = self::get_raw_url( $url_type );
 		} else {
-			$home_url = self::normalize_www_in_url( 'home', 'home_url' );
+			$url = self::normalize_www_in_url( $url_type, $url_function );
+			$url = self::get_protocol_normalized_url( $url_function, $url );
 		}
 
-		$home_url = self::get_protocol_normalized_url( 'home_url', $home_url );
+		return $url;
+	}
+
+	public static function home_url() {
+		$url = self::get_raw_or_filtered_url( 'home', 'home_url' );
 
 		/**
 		 * Allows overriding of the home_url value that is synced back to WordPress.com.
@@ -163,20 +174,11 @@ public static function home_url() {
 		 *
 		 * @param string $home_url
 		 */
-		return esc_url_raw( apply_filters( 'jetpack_sync_home_url', $home_url ) );
+		return esc_url_raw( apply_filters( 'jetpack_sync_home_url', $url ) );
 	}
 
 	public static function site_url() {
-		if (
-			! Jetpack_Constants::is_defined( 'JETPACK_SYNC_USE_RAW_URL' ) ||
-			Jetpack_Constants::get_constant( 'JETPACK_SYNC_USE_RAW_URL' )
-		) {
-			$site_url =  self::get_raw_url( 'siteurl' );
-		} else {
-			$site_url = self::normalize_www_in_url( 'siteurl', 'site_url' );
-		}
-
-		$site_url =  self::get_protocol_normalized_url( 'site_url', $site_url );
+		$url = self::get_raw_or_filtered_url( 'siteurl', 'site_url' );
 
 		/**
 		 * Allows overriding of the site_url value that is synced back to WordPress.com.
@@ -185,7 +187,7 @@ public static function site_url() {
 		 *
 		 * @param string $site_url
 		 */
-		return esc_url_raw( apply_filters( 'jetpack_sync_site_url', $site_url ) );
+		return esc_url_raw( apply_filters( 'jetpack_sync_site_url', $url ) );
 	}
 
 	public static function main_network_site_url() {
@@ -215,8 +217,6 @@ public static function get_protocol_normalized_url( $callable, $new_value ) {
 	}
 
 	public static function get_raw_url( $option_name ) {
-		global $wpdb;
-
 		$value = null;
 		if ( 'home' == $option_name && Jetpack_Constants::is_defined( 'WP_HOME' ) ) {
 			$value = Jetpack_Constants::get_constant( 'WP_HOME' );
@@ -228,14 +228,6 @@ public static function get_raw_url( $option_name ) {
 			$value = Jetpack_Options::get_raw_option( $option_name );
 		}
 
-		if ( is_ssl() ) {
-			$scheme = 'https';
-		} else {
-			$scheme = parse_url( $value, PHP_URL_SCHEME );
-		}
-
-		$value = set_url_scheme( $value, $scheme );
-
 		return $value;
 	}