Merge branch 'rowatt-fix-jetpack-post-images-notice'

Author: samhotchkiss

Diff for: class.jetpack-post-images.php

@@ -194,13 +194,19 @@ static function from_attachment( $post_id, $width = 200, $height = 200 ) {
 		* We can load up all the images found in the HTML source and then
 		* compare URLs to see if an image is attached AND inserted.
 		*/
-		$html_images = array();
 		$html_images = self::from_html( $post_id );
 		$inserted_images = array();
 
 		foreach( $html_images as $html_image ) {
 			$src = parse_url( $html_image['src'] );
-			$inserted_images[] = $src['scheme'] . '://' . $src['host'] . $src['path']; // strip off any query strings
+			// strip off any query strings from src
+			if( ! empty( $src['scheme'] ) && ! empty( $src['host'] ) ) {
+				$inserted_images[] = $src['scheme'] . '://' . $src['host'] . $src['path'];
+			} elseif( ! empty( $src['host'] ) ) {
+				$inserted_images[] = set_url_scheme( 'http://' . $src['host'] . $src['path'] );
+			} else {
+				$inserted_images[] = site_url( '/' ) . $src['path'];
+			}
 		}
 		foreach( $images as $i => $image ) {
 			if ( !in_array( $image['src'], $inserted_images ) )