Namespaced and refactored get_youtube_id()

Prepended 'jetpack_' to the function to add a namespacing to prevent other plugins from conflicting. Related #126
Automattic · Jun 12, 2014 · f97b892 · f97b892
1 parent 6368137
commit f97b892
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/class.media-summary.php b/class.media-summary.php
@@ -104,7 +104,7 @@ static function get( $post_id, $blog_id = 0, $args = array() ) {
 						$return['video']  = 'http://' .  $embed;
 						$return['secure']['video'] = self::https( $return['video'] );
 						if ( strstr( $embed, 'youtube' ) ) {
-							$return['image'] = self::get_video_poster( 'youtube', get_youtube_id( $return['video'] ) );
+							$return['image'] = self::get_video_poster( 'youtube', jetpack_get_youtube_id( $return['video'] ) );
 							$return['secure']['image'] = self::https( $return['image'] );
 						} else if ( strstr( $embed, 'vimeo' ) ) {
 							$poster_image = get_post_meta( $post_id, 'vimeo_poster_image', true );

diff --git a/functions.compat.php b/functions.compat.php
@@ -14,12 +14,11 @@ function rawurlencode_deep( $value ) {
 }
 endif;
 
-if ( !function_exists( 'get_youtube_id' ) ) :
 /**
 * @param $url Can be just the $url or the whole $atts array
 * @return bool|mixed The Youtube video ID
 */
-function get_youtube_id( $url ) {
+function jetpack_get_youtube_id( $url ) {
 	// Do we have an $atts array?  Get first att
 	if ( is_array( $url ) )
 		$url = $url[0];
@@ -44,7 +43,6 @@ function get_youtube_id( $url ) {
 
 	return $id;
 }
-endif;
 
 if ( !function_exists( 'youtube_sanitize_url' ) ) :
 /**
@@ -67,4 +65,4 @@ function youtube_sanitize_url( $url ) {
 
 	return $url;
 }
-endif;
+endif;
diff --git a/modules/publicize/enhanced-open-graph.php b/modules/publicize/enhanced-open-graph.php
@@ -90,7 +90,7 @@ function enhanced_og_video( $tags ) {
 
 	if ( preg_match( '/((youtube|vimeo)\.com|youtu.be)/', $video_url ) ) {
 		if ( strstr( $video_url, 'youtube' ) ) {
-			$id = get_youtube_id( $video_url );
+			$id = jetpack_get_youtube_id( $video_url );
 			$video_url = 'http://www.youtube.com/v/' . $id . '?version=3&autohide=1';
 			$secure_video_url = 'https://www.youtube.com/v/' . $id . '?version=3&autohide=1';
 		} else if ( strstr( $video_url, 'vimeo' ) ) {
@@ -116,4 +116,4 @@ function enhanced_og_has_featured_image( $post_id ) {
 	if ( !empty( $featured ) && count( $featured ) > 0 )
 		return true;
 	return false;
-}
+}
diff --git a/modules/shortcodes/youtube.php b/modules/shortcodes/youtube.php
@@ -139,21 +139,14 @@ function youtube_sanitize_url( $url ) {
  *    http://youtu.be/Rrohlqeir5E
  */
 
-/**
- * Same as get_youtube_id(), but with the prefix that function should've had.
- */
-function jetpack_shortcode_get_youtube_id( $url ) {
-	return get_youtube_id( $url );
-}
-
 /**
  * Converts a YouTube URL into an embedded YouTube video.
  */
 function youtube_id( $url ) {
 	if ( apply_filters( 'jetpack_bail_on_shortcode', false, 'youtube' ) )
 		return '';
 
-	if ( ! $id = get_youtube_id( $url ) )
+	if ( ! $id = jetpack_get_youtube_id( $url ) )
 		return '<!--YouTube Error: bad URL entered-->';
 
 	$url = youtube_sanitize_url( $url );