diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 8ee665a9df..d72c881d16 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1896,7 +1896,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { switch ( $update->type ) { case 'core': return 'WordPress'; // Not translated - break; + case 'theme': $theme = wp_get_theme( $update->slug ); if ( $theme->exists() ) diff --git a/wp-includes/kses.php b/wp-includes/kses.php index 8e1f863506..353dde2043 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -556,22 +556,22 @@ function wp_kses_allowed_html( $context = '' ) { case 'post': /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context ); - break; + case 'user_description': case 'pre_user_description': $tags = $allowedtags; $tags['a']['rel'] = true; /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', $tags, $context ); - break; + case 'strip': /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', array(), $context ); - break; + case 'entities': /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context); - break; + case 'data': default: /** This filter is documented in wp-includes/kses.php */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 310b10c4d1..55552a38b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31099'; +$wp_version = '4.2-alpha-31100'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.