Hardening: Add escaping to the language attributes used on html elements.

johnbillion · johnbillion · commit f5e925f86c86 · 2017-11-29T16:49:03.000Z
Merges [42259] to the 3.7 branch. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@42313 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
@@ -1927,12 +1927,14 @@ function language_attributes($doctype = 'html') {
 	if ( function_exists( 'is_rtl' ) && is_rtl() )
 		$attributes[] = 'dir="rtl"';
 
-	if ( $lang = get_bloginfo('language') ) {
-		if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
-			$attributes[] = "lang=\"$lang\"";
+	if ( $lang = get_bloginfo( 'language' ) ) {
+		if ( get_option( 'html_type' ) == 'text/html' || $doctype == 'html' ) {
+			$attributes[] = 'lang="' . esc_attr( $lang ) . '"';
+		}
 
-		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
-			$attributes[] = "xml:lang=\"$lang\"";
+		if ( get_option( 'html_type' ) != 'text/html' || $doctype == 'xhtml' ) {
+			$attributes[] = 'xml:lang="' . esc_attr( $lang ) . '"';
+		}
 	}
 
 	$output = implode(' ', $attributes);
