From 0b54cfd77b7d169ecce290f12328890d0788ff11 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sun, 30 Nov 2014 06:12:23 +0000 Subject: [PATCH] IETF language changes in MediaElement: https://github.com/johndyer/mediaelement/pull/1270/ Reverts [28801]. Fixes #29182. Built from https://develop.svn.wordpress.org/trunk@30637 git-svn-id: http://core.svn.wordpress.org/trunk@30627 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/script-loader.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 94c28f3c68..0a3de3fd41 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -308,7 +308,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.15.1', 1 ); did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array( - 'language' => substr( get_bloginfo( 'language' ), 0, 2 ), + 'language' => get_bloginfo( 'language' ), 'strings' => array( 'Close' => __( 'Close' ), 'Fullscreen' => __( 'Fullscreen' ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 0f1dcf046d..cbe4674da2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30636'; +$wp_version = '4.1-beta2-30637'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.