WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update/Install: Correctly decrement the update count after translation updates. 

After [37714], an error was unnecessarily being displayed in the JavaScript console when updating translations on `wp-admin/update-core.php`. Let's not throw an error in these cases.

Props afercia.
Fixes #37127.
Built from https://develop.svn.wordpress.org/trunk@37971


git-svn-id: http://core.svn.wordpress.org/trunk@37912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2016-07-05 15:18:27 +00:00
parent 848318aeb1
commit b55493e3e6
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-admin/js/updates.js
View File

@ -295,20 +295,12 @@
$dashboardNavMenuUpdateCount.removeAttr( 'title' ); $dashboardNavMenuUpdateCount.removeAttr( 'title' );
$dashboardNavMenuUpdateCount.find( '.update-count' ).text( count ); $dashboardNavMenuUpdateCount.find( '.update-count' ).text( count );
switch ( type ) { if ( 'plugin' === type ) {
case 'plugin': $menuItem = $( '#menu-plugins' );
$menuItem = $( '#menu-plugins' ); $itemCount = $menuItem.find( '.plugin-count' );
$itemCount = $menuItem.find( '.plugin-count' ); } else if ( 'theme' === type ) {
break; $menuItem = $( '#menu-appearance' );
$itemCount = $menuItem.find( '.theme-count' );
case 'theme':
$menuItem = $( '#menu-appearance' );
$itemCount = $menuItem.find( '.theme-count' );
break;
default:
window.console.error( '"%s" is not white-listed to have its count decremented.', type );
return;
} }
// Decrement the counter of the other menu items. // Decrement the counter of the other menu items.

2
wp-admin/js/updates.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-beta1-37970'; $wp_version = '4.6-beta1-37971';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.