From cb7a7709cb88878bee61701103c67ec9887b8d5b Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 1 Aug 2013 15:41:11 +0000 Subject: [PATCH] On the about page, only serve Opera mp4. Pre-Chromium Opera and MediaElement.js doesn't load ogv (video/ogg). see #24832. git-svn-id: http://core.svn.wordpress.org/trunk@24950 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/about.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/wp-admin/about.php b/wp-admin/about.php index 24427723f4..c7a7daac40 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -75,14 +75,22 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

-
(is_ssl() ? 'https://' : 'http://s.' ) . 'wordpress.org/images/core/3.6/sample-video.mp4', - 'ogv' => (is_ssl() ? 'https://' : 'http://s.' ) . 'wordpress.org/images/core/3.6/sample-video.ogv', +
"$sample_video.mp4", + 'ogv' => "$sample_video.ogv", 'width' => 625, 'height' => 360, - ) - ); ?>
+ ); + // Opera 12 (Presto, pre-Chromium) fails to load ogv properly + // when combined with ME.js. Works fine in Opera 15. + // Don't serve ogv to Opera 12 to avoid complete brokeness. + if ( $GLOBALS['is_opera'] ) + unset( $args['ogv'] ); + // Our current ME.js API is limited to shortcodes in posts. + echo wp_video_shortcode( $args ); + ?>