Revert "change parse_url() to wp_parse_url()"

This reverts commit 90393ea.
jritterbush · Mar 8, 2017 · 0b4c9ff · 0b4c9ff
1 parent 2120a7a
commit 0b4c9ff
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/includes/embeds/class-amp-dailymotion-embed.php b/includes/embeds/class-amp-dailymotion-embed.php
@@ -92,7 +92,7 @@ public function render( $args ) {
 	}
 
 	private function get_video_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
+		$parsed_url = parse_url( $url );
 		parse_str( $parsed_url['path'], $path );
 		$tok = explode( '/', $parsed_url['path'] );
 		$tok = explode( '_', $tok[2] );

diff --git a/includes/embeds/class-amp-soundcloud-embed.php b/includes/embeds/class-amp-soundcloud-embed.php
@@ -86,7 +86,7 @@ public function render( $args ) {
 	}
 
 	private function get_track_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
+		$parsed_url = parse_url( $url );
 		$tok = explode( '/', $parsed_url['path'] );
 		$track_id = $tok[2];
 

diff --git a/includes/embeds/class-amp-youtube-embed.php b/includes/embeds/class-amp-youtube-embed.php
@@ -92,7 +92,7 @@ public function render( $args ) {
 
 	private function get_video_id_from_url( $url ) {
 		$video_id = false;
-		$parsed_url = wp_parse_url( $url );
+		$parsed_url = parse_url( $url );
 
 		if ( self::SHORT_URL_HOST === substr( $parsed_url['host'], -strlen( self::SHORT_URL_HOST ) ) ) {
 			// youtu.be/{id}

diff --git a/includes/sanitizers/class-amp-img-sanitizer.php b/includes/sanitizers/class-amp-img-sanitizer.php
@@ -144,7 +144,7 @@ private function filter_attributes( $attributes ) {
 
 	private function is_gif_url( $url ) {
 		$ext = self::$anim_extension;
-		$path = wp_parse_url( $url, PHP_URL_PATH );
+		$path = parse_url( $url, PHP_URL_PATH );
 		return substr( $path, -strlen( $ext ) ) === $ext;
 	}
 }
diff --git a/includes/utils/class-amp-image-dimension-extractor.php b/includes/utils/class-amp-image-dimension-extractor.php
@@ -37,7 +37,7 @@ public static function normalize_url( $url ) {
 			return set_url_scheme( $url, 'http' );
 		}
 
-		$parsed = wp_parse_url( $url );
+		$parsed = parse_url( $url );
 		if ( ! isset( $parsed['host'] ) ) {
 			$path = '';
 			if ( isset( $parsed['path'] ) ) {

diff --git a/jetpack-helper.php b/jetpack-helper.php
@@ -56,7 +56,7 @@ function jetpack_amp_build_stats_pixel_url() {
 		$blog = Jetpack_Options::get_option( 'id' );
 		$tz = get_option( 'gmt_offset' );
 		$v = 'ext';
-		$blog_url = wp_parse_url( site_url() );
+		$blog_url = parse_url( site_url() );
 		$srv = $blog_url['host'];
 		$j = sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION );
 		$post = $wp_the_query->get_queried_object_id();

diff --git a/wpcom-helper.php b/wpcom-helper.php
@@ -124,12 +124,12 @@ function wpcom_amp_extract_image_dimensions_from_querystring( $dimensions ) {
 			continue;
 		}
 
-		$host = wp_parse_url( $url, PHP_URL_HOST );
+		$host = parse_url( $url, PHP_URL_HOST );
 		if ( ! wp_endswith( $host, '.wp.com' ) || ! wp_endswith( $host, '.files.wordpress.com' ) ) {
 			continue;
 		}
 
-		$query = wp_parse_url( $url, PHP_URL_QUERY );
+		$query = parse_url( $url, PHP_URL_QUERY );
 		$w = isset( $query['w'] ) ? absint( $query['w'] ) : false;
 		$h = isset( $query['h'] ) ? absint( $query['h'] ) : false;