Updating plugins easy-table, jetpack, openid, public-post preview, talbe-of-contents-plus, wordress-mobile-pack - Bug 574468

1 files changed, 23 insertions, 16 deletions

diff --git a/plugins/jetpack/modules/shortcodes/facebook.php b/plugins/jetpack/modules/shortcodes/facebook.php
index 239253d6..c054ecc6 100644
--- a/plugins/jetpack/modules/shortcodes/facebook.php
+++ b/plugins/jetpack/modules/shortcodes/facebook.php
@@ -7,8 +7,9 @@ define( 'JETPACK_FACEBOOK_EMBED_REGEX', '#^https?://(www.)?facebook\.com/([^/]+)
 define( 'JETPACK_FACEBOOK_ALTERNATE_EMBED_REGEX', '#^https?://(www.)?facebook\.com/permalink.php\?([^\s]+)#' );
 define( 'JETPACK_FACEBOOK_PHOTO_EMBED_REGEX', '#^https?://(www.)?facebook\.com/photo.php\?([^\s]+)#' );
 define( 'JETPACK_FACEBOOK_PHOTO_ALTERNATE_EMBED_REGEX', '#^https?://(www.)?facebook\.com/([^/]+)/photos/([^/]+)?#' );
-
 define( 'JETPACK_FACEBOOK_VIDEO_EMBED_REGEX', '#^https?://(www.)?facebook\.com/video.php\?([^\s]+)#' );
+define( 'JETPACK_FACEBOOK_VIDEO_ALTERNATE_EMBED_REGEX', '#^https?://(www.)?facebook\.com/([^/]+)/videos/([^/]+)?#' );
+
 
 // Example URL: https://www.facebook.com/VenusWilliams/posts/10151647007373076
 wp_embed_register_handler( 'facebook', JETPACK_FACEBOOK_EMBED_REGEX, 'jetpack_facebook_embed_handler' );
@@ -24,16 +25,11 @@ wp_embed_register_handler( 'facebook-alternate-photo', JETPACK_FACEBOOK_PHOTO_AL
 
 // Videos e.g. https://www.facebook.com/video.php?v=772471122790796
 wp_embed_register_handler( 'facebook-video', JETPACK_FACEBOOK_VIDEO_EMBED_REGEX, 'jetpack_facebook_embed_handler' );
+// Videos  https://www.facebook.com/WhiteHouse/videos/10153398464269238/
+wp_embed_register_handler( 'facebook-alternate-video', JETPACK_FACEBOOK_VIDEO_ALTERNATE_EMBED_REGEX, 'jetpack_facebook_embed_handler' );
 
 function jetpack_facebook_embed_handler( $matches, $attr, $url ) {
-	static $did_script;
-
-	if ( ! $did_script ) {
-		$did_script = true;
-		add_action( 'wp_footer', 'jetpack_facebook_add_script' );
-	}
-
-	if ( false !== strpos( $url, 'video.php' ) ) {
+	if ( false !== strpos( $url, 'video.php' ) || false !== strpos( $url, '/videos/' ) ) {
 		$embed = sprintf( '<div class="fb-video" data-allowfullscreen="true" data-href="%s"></div>', esc_url( $url ) );
 	} else {
 		$embed = sprintf( '<fb:post href="%s"></fb:post>', esc_url( $url ) );
@@ -43,16 +39,23 @@ function jetpack_facebook_embed_handler( $matches, $attr, $url ) {
 	if ( defined( 'DOING_AJAX' ) && DOING_AJAX && ! empty( $_POST['action'] ) && 'parse-embed' == $_POST['action'] ) {
 		return $embed . '<script src="//connect.facebook.net/en_US/all.js#xfbml=1"></script>';
 	} else {
+		wp_enqueue_script( 'jetpack-facebook-embed', plugins_url( 'js/facebook.js', __FILE__ ), array( 'jquery' ), null, true );
+		/** This filter is documented in modules/sharedaddy/sharing-sources.php */
+		$fb_app_id = apply_filters( 'jetpack_sharing_facebook_app_id', '249643311490' );
+		if ( ! is_numeric( $fb_app_id ) ) {
+			$fb_app_id = '';
+		}
+		wp_localize_script(
+			'jetpack-facebook-embed',
+			'jpfbembed',
+			array(
+				'appid' => $fb_app_id
+			)
+		);
 		return $embed;
 	}
 }
 
-function jetpack_facebook_add_script() {
-	?>
-	<div id="fb-root"></div> <script>(function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; js.src = "//connect.facebook.net/en_US/all.js#xfbml=1"; fjs.parentNode.insertBefore(js, fjs); }(document, "script", "facebook-jssdk"));</script>
-	<?php
-}
-
 add_shortcode( 'facebook', 'jetpack_facebook_shortcode_handler' );
 
 function jetpack_facebook_shortcode_handler( $atts ) {
@@ -61,8 +64,12 @@ function jetpack_facebook_shortcode_handler( $atts ) {
 	if ( empty( $atts['url'] ) )
 		return;
 
-	if ( ! preg_match( JETPACK_FACEBOOK_EMBED_REGEX, $atts['url'] ) && ! preg_match( JETPACK_FACEBOOK_PHOTO_EMBED_REGEX, $atts['url'] ) )
+	if ( ! preg_match( JETPACK_FACEBOOK_EMBED_REGEX, $atts['url'] )
+	&& ! preg_match( JETPACK_FACEBOOK_PHOTO_EMBED_REGEX, $atts['url'] )
+	&& ! preg_match( JETPACK_FACEBOOK_VIDEO_EMBED_REGEX, $atts['url'] )
+	&& ! preg_match( JETPACK_FACEBOOK_VIDEO_ALTERNATE_EMBED_REGEX, $atts['url'] )  ) {
 		return;
+	}
 
 	return $wp_embed->shortcode( $atts, $atts['url'] );
 }