Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/js/_enqueues/admin/tags.js

@@ -59,8 +59,10 @@ jQuery( function($) {
 							nextFocus = prevFocus;
 						}
 					}
-
-					tr.fadeOut('normal', function(){ tr.remove(); });
+					tr.fadeOut('normal', function() {
+						tr.remove();
+						updateTableNavCount();
+					});
 
 					/**
 					 * Removes the term from the parent box and the tag cloud.
@@ -73,7 +75,7 @@ jQuery( function($) {
 					$('a.tag-link-' + data.match(/tag_ID=(\d+)/)[1]).remove();
 					nextFocus.trigger( 'focus' );
 					message = wp.i18n.__( 'The selected tag has been deleted.' );
-			
+
 				} else if ( '-1' == r ) {
 					message = wp.i18n.__( 'Sorry, you are not allowed to do that.' );
 					$('#ajax-response').empty().append('<div class="notice notice-error"><p>' + message + '</p></div>');
@@ -103,6 +105,53 @@ jQuery( function($) {
 		tr.find( ':input, a' ).prop( 'disabled', false ).removeAttr( 'tabindex' );
 	}
 
+	/**
+	 * Updates the item count and table navigation after a tag is added or removed.
+	 *
+	 * Tags are added and removed client-side, but the item count, the `.tablenav`
+	 * regions, the search box, and the empty-state row are otherwise only
+	 * reconciled by PHP on a full page reload. This keeps them in sync.
+	 *
+	 * @param {string} [action] Pass 'add' when a tag was added. Any other value,
+	 *                          including none, is treated as a removal.
+	 *
+	 * @return {void}
+	 */
+	function updateTableNavCount( action ) {
+		var $displayingNum = $( '.tablenav-pages .displaying-num' ),
+			currentCount   = parseInt( $displayingNum.first().text().replace( /[^0-9]/g, '' ), 10 ) || 0,
+			itemCount      = ( 'add' === action ) ? currentCount + 1 : Math.max( currentCount - 1, 0 ),
+			formattedCount = itemCount.toLocaleString();
+
+		$displayingNum.text(
+			wp.i18n.sprintf(
+				/* translators: %s: Number of items. */
+				wp.i18n._n( '%s item', '%s items', itemCount ),
+				formattedCount
+			)
+		);
+
+		if ( itemCount < 1 ) {
+			// No tags remain: show the empty-state row and hide the navigation.
+			var $list = $( '#the-list' );
+
+ 			if ( ! $list.find( 'tr.no-items' ).length ) {
+ 				var colspan = $list.closest( 'table' ).find( 'thead > tr' ).first().children( ':not(.hidden)' ).length;
+ 				$list.append(
+ 					'<tr class="no-items"><td class="colspanchange" colspan="' + colspan + '">' +
+ 					wp.i18n.__( 'No tags found.' ) +
+ 					'</td></tr>'
+ 				);
+ 			}
+			$( '.tablenav > *' ).hide();
+			$( 'p.search-box' ).hide();
+		} else {
+			$( '#the-list' ).find( 'tr.no-items' ).remove();
+			$( '.tablenav > *' ).show();
+			$( 'p.search-box' ).show();
+		}
+	}
+
 	/**
 	 * Adds a deletion confirmation when removing a tag.
 	 *
@@ -192,6 +241,8 @@ jQuery( function($) {
 			}
 
 			$('input:not([type="checkbox"]):not([type="radio"]):not([type="button"]):not([type="submit"]):not([type="reset"]):visible, textarea:visible', form).val('');
+
+			updateTableNavCount( 'add' );
 		});
 
 		return false;

src/wp-admin/includes/class-wp-list-table.php

@@ -1029,6 +1029,8 @@ protected function get_items_per_page( $option, $default_value = 20 ) {
 	 */
 	protected function pagination( $which ) {
 		if ( empty( $this->_pagination_args['total_items'] ) ) {
+			// translators: Number is a fixed value. This is default text when no items are found.
+			echo '<div class="tablenav-pages no-pages"><span class="displaying-num">' . __( '0 items' ) . '</span></div>';
 			return;
 		}
 
@@ -1685,12 +1687,16 @@ protected function display_tablenav( $which ) {
 		?>
 	<div class="tablenav <?php echo esc_attr( $which ); ?>">
 
-		<?php if ( $this->has_items() ) : ?>
-		<div class="alignleft actions bulkactions">
+		<?php
+		$visibility = ' hidden';
+		if ( $this->has_items() ) {
+			$visibility = '';
+		}
+		?>
+		<div class="alignleft actions bulkactions<?php echo $visibility; ?>">
 			<?php $this->bulk_actions( $which ); ?>
 		</div>
-			<?php
-		endif;
+		<?php
 		$this->extra_tablenav( $which );
 		$this->pagination( $which );
 		?>

src/wp-admin/options-privacy.php

@@ -51,12 +51,15 @@ static function ( $body_class ) {
 	check_admin_referer( $action );
 
 	if ( 'set-privacy-page' === $action ) {
-		$privacy_policy_page_id = isset( $_POST['page_for_privacy_policy'] ) ? (int) $_POST['page_for_privacy_policy'] : 0;
+		$previous_privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+		$privacy_policy_page_id          = isset( $_POST['page_for_privacy_policy'] ) ? (int) $_POST['page_for_privacy_policy'] : 0;
 		update_option( 'wp_page_for_privacy_policy', $privacy_policy_page_id );
 
-		$privacy_page_updated_message = __( 'Privacy Policy page updated successfully.' );
+		$privacy_page_message_type = 'success';
 
 		if ( $privacy_policy_page_id ) {
+			$privacy_page_updated_message = __( 'Privacy Policy page updated successfully.' );
+
 			/*
 			 * Don't always link to the menu customizer:
 			 *
@@ -75,9 +78,16 @@ static function ( $body_class ) {
 					esc_url( add_query_arg( 'autofocus[panel]', 'nav_menus', admin_url( 'customize.php' ) ) )
 				);
 			}
+		} elseif ( $previous_privacy_policy_page_id ) {
+			// A previously set Privacy Policy page was cleared.
+			$privacy_page_updated_message = __( 'Privacy Policy page removed.' );
+		} else {
+			// No Privacy Policy page was set before, and none is set now.
+			$privacy_page_updated_message = __( 'No Privacy Policy page is currently set.' );
+			$privacy_page_message_type    = 'info';
 		}
 
-		add_settings_error( 'page_for_privacy_policy', 'page_for_privacy_policy', $privacy_page_updated_message, 'success' );
+		add_settings_error( 'page_for_privacy_policy', 'page_for_privacy_policy', $privacy_page_updated_message, $privacy_page_message_type );
 	} elseif ( 'create-privacy-page' === $action ) {
 
 		if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {