Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-22 04:45:03 +02:00
Code Issues Projects Releases Wiki Activity

Jump statements should not be followed by other statements (there were 5 lingering).

Browse Source 
See #30799.

Built from https://develop.svn.wordpress.org/trunk@31100


git-svn-id: http://core.svn.wordpress.org/trunk@31081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-08 21:15:22 +00:00
parent 4feecb922c
commit 4a1ad9acec
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-upgrader.php
View File

@ -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() )

8
wp-includes/kses.php
View File

@ -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 */

2
wp-includes/version.php
View File

@ -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.