ntwb / wordpress

src/wp-admin/comment.php

Braces +41 added lines, -31 removed lines

@@ -18,20 +18,23 @@ 
 global $action;
 wp_reset_vars( array('action') );
 
-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
+}
 
-if ( 'cdc' == $action )
+if ( 'cdc' == $action ) {
 	$action = 'delete';
-elseif ( 'mac' == $action )
+} elseif ( 'mac' == $action ) {
 	$action = 'approve';
+}
 
 if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
-		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
-		$action = 'trash';
-}
+	if ( 'spam' == $_GET['dt'] ) {
+			$action = 'spam';
+	} elseif ( 'trash' == $_GET['dt'] ) {
+			$action = 'trash';
+	}
+	}
 
 switch( $action ) {
 
@@ -57,14 +60,17 @@ 
 
 	$comment_id = absint( $_GET['c'] );
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( !$comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	}
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	}
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	}
 
 	$comment = get_comment_to_edit( $comment_id );
 
@@ -244,26 +250,30 @@ 
 case 'unapprovecomment' :
 	$comment_id = absint( $_REQUEST['c'] );
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+	} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+	}
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
-
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+	if ( !$comment = get_comment($comment_id) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+	}
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+	}
+
+	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') ) {
+			$redir = wp_get_referer();
+	} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+	} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	} else {
+			$redir = admin_url('edit-comments.php');
+	}
 
 	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
 

Spacing +107 added lines, -107 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -16,59 +16,59 @@ 
  * @global string $action
  */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars(array('action'));
 
-if ( isset( $_POST['deletecomment'] ) )
+if (isset($_POST['deletecomment']))
 	$action = 'deletecomment';
 
-if ( 'cdc' == $action )
+if ('cdc' == $action)
 	$action = 'delete';
-elseif ( 'mac' == $action )
+elseif ('mac' == $action)
 	$action = 'approve';
 
-if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
+if (isset($_GET['dt'])) {
+	if ('spam' == $_GET['dt'])
 		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
+	elseif ('trash' == $_GET['dt'])
 		$action = 'trash';
 }
 
-switch( $action ) {
+switch ($action) {
 
 case 'editcomment' :
 	$title = __('Edit Comment');
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
+			'<p>'.__('You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.').'</p>'.
+			'<p>'.__('You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
 
 	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'javascript:history.go(-1)'));
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	if ( ! current_user_can('edit_comment', $comment_id))
+		comment_footer_die(__('Sorry, you are not allowed to edit this comment.'));
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ('trash' == $comment->comment_approved)
+		comment_footer_die(__('This comment is in the Trash. Please move it out of the Trash if you want to edit it.'));
 
-	$comment = get_comment_to_edit( $comment_id );
+	$comment = get_comment_to_edit($comment_id);
 
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+	include(ABSPATH.'wp-admin/edit-form-comment.php');
 
 	break;
 
@@ -79,40 +79,40 @@ 
 
 	$title = __('Moderate Comment');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( ! $comment = get_comment( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
+	if ( ! $comment = get_comment($comment_id)) {
+		wp_redirect(admin_url('edit-comments.php?error=1'));
 		die();
 	}
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
+		wp_redirect(admin_url('edit-comments.php?error=2'));
 		die();
 	}
 
 	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+	if ($action == str_replace('1', 'approve', $comment->comment_approved)) {
+		wp_redirect(admin_url('edit-comments.php?same='.$comment_id));
 		die();
  	}
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$formaction    = $action . 'comment';
+	$formaction    = $action.'comment';
 	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
 	$nonce_action .= $comment_id;
 
 ?>
 <div class="wrap">
 
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
-switch ( $action ) {
+switch ($action) {
 	case 'spam' :
 		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = _x( 'Mark as Spam', 'comment' );
+		$button      = _x('Mark as Spam', 'comment');
 		break;
 	case 'trash' :
 		$caution_msg = __('You are about to move the following comment to the Trash:');
@@ -128,9 +128,9 @@ 
 		break;
 }
 
-if ( $comment->comment_approved != '0' ) { // if not unapproved
+if ($comment->comment_approved != '0') { // if not unapproved
 	$message = '';
-	switch ( $comment->comment_approved ) {
+	switch ($comment->comment_approved) {
 		case '1' :
 			$message = __('This comment is currently approved.');
 			break;
@@ -141,68 +141,68 @@ 
 			$message  = __('This comment is currently in the Trash.');
 			break;
 	}
-	if ( $message ) {
-		echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+	if ($message) {
+		echo '<div id="message" class="notice notice-info"><p>'.$message.'</p></div>';
 	}
 }
 ?>
-<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
+<div id="message" class="notice notice-warning"><p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p></div>
 
 <table class="form-table comment-ays">
 <tr>
 <th scope="row"><?php _e('Author'); ?></th>
-<td><?php comment_author( $comment ); ?></td>
+<td><?php comment_author($comment); ?></td>
 </tr>
-<?php if ( get_comment_author_email( $comment ) ) { ?>
+<?php if (get_comment_author_email($comment)) { ?>
 <tr>
 <th scope="row"><?php _e('Email'); ?></th>
-<td><?php comment_author_email( $comment ); ?></td>
+<td><?php comment_author_email($comment); ?></td>
 </tr>
 <?php } ?>
-<?php if ( get_comment_author_url( $comment ) ) { ?>
+<?php if (get_comment_author_url($comment)) { ?>
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
+<td><a href="<?php comment_author_url($comment); ?>"><?php comment_author_url($comment); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
-	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
+	<th scope="row"><?php /* translators: column name or table row header */ _e('In Response To'); ?></th>
 	<td>
 	<?php
 		$post_id = $comment->comment_post_ID;
-		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+		if (current_user_can('edit_post', $post_id)) {
+			$post_link = "<a href='".esc_url(get_edit_post_link($post_id))."'>";
+			$post_link .= esc_html(get_the_title($post_id)).'</a>';
 		} else {
-			$post_link = esc_html( get_the_title( $post_id ) );
+			$post_link = esc_html(get_the_title($post_id));
 		}
 		echo $post_link;
 
-		if ( $comment->comment_parent ) {
-			$parent      = get_comment( $comment->comment_parent );
-			$parent_link = esc_url( get_comment_link( $parent ) );
-			$name        = get_comment_author( $parent );
+		if ($comment->comment_parent) {
+			$parent      = get_comment($comment->comment_parent);
+			$parent_link = esc_url(get_comment_link($parent));
+			$name        = get_comment_author($parent);
 			printf(
 				/* translators: %s: comment link */
-				' | ' . __( 'In reply to %s.' ),
-				'<a href="' . $parent_link . '">' . $name . '</a>'
+				' | '.__('In reply to %s.'),
+				'<a href="'.$parent_link.'">'.$name.'</a>'
 			);
 		}
 	?>
 	</td>
 </tr>
 <tr>
-	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
+	<th scope="row"><?php _e('Submitted on'); ?></th>
 	<td>
 	<?php
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(__('%1$s at %2$s'),
 			/* translators: comment date format. See https://secure.php.net/date */
-			get_comment_date( __( 'Y/m/d' ), $comment ),
-			get_comment_date( __( 'g:i a' ), $comment )
+			get_comment_date(__('Y/m/d'), $comment),
+			get_comment_date(__('g:i a'), $comment)
 		);
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
-			echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+		if ('approved' === wp_get_comment_status($comment) && ! empty ($comment->comment_post_ID)) {
+			echo '<a href="'.esc_url(get_comment_link($comment)).'">'.$submitted.'</a>';
 		} else {
 			echo $submitted;
 		}
@@ -212,8 +212,8 @@ 
 <tr>
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td class="comment-content">
-	<?php comment_text( $comment ); ?>
-	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
+	<?php comment_text($comment); ?>
+	<p class="edit-comment"><a href="<?php echo admin_url("comment.php?action=editcomment&amp;c={$comment->comment_ID}"); ?>"><?php esc_html_e('Edit'); ?></a></p>
 </td>
 </tr>
 </table>
@@ -221,11 +221,11 @@ 
 <form action="comment.php" method="get" class="comment-ays-submit">
 
 <p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+	<?php submit_button($button, 'primary', 'submit', false); ?>
+	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e('Cancel'); ?></a>
 </p>
 
-<?php wp_nonce_field( $nonce_action ); ?>
+<?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
 <input type="hidden" name="noredir" value="1" />
@@ -242,75 +242,75 @@ 
 case 'unspamcomment'    :
 case 'approvecomment'   :
 case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	$comment_id = absint($_REQUEST['c']);
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
+	if (in_array($action, array('approvecomment', 'unapprovecomment')))
+		check_admin_referer('approve-comment_'.$comment_id);
 	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		check_admin_referer('delete-comment_'.$comment_id);
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'edit-comments.php'));
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
+		comment_footer_die(__('Sorry, you are not allowed to edit comments on this post.'));
 
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
+	if ('' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php'))
 		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
+	elseif ('' != wp_get_original_referer() && ! $noredir)
 		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	elseif (in_array($action, array('approvecomment', 'unapprovecomment')))
+		$redir = admin_url('edit-comments.php?p='.absint($comment->comment_post_ID));
 	else
 		$redir = admin_url('edit-comments.php');
 
-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+	$redir = remove_query_arg(array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir);
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'deletecomment' :
-			wp_delete_comment( $comment );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
+			wp_delete_comment($comment);
+			$redir = add_query_arg(array('deleted' => '1'), $redir);
 			break;
 		case 'trashcomment' :
-			wp_trash_comment( $comment );
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+			wp_trash_comment($comment);
+			$redir = add_query_arg(array('trashed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'untrashcomment' :
-			wp_untrash_comment( $comment );
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
+			wp_untrash_comment($comment);
+			$redir = add_query_arg(array('untrashed' => '1'), $redir);
 			break;
 		case 'spamcomment' :
-			wp_spam_comment( $comment );
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+			wp_spam_comment($comment);
+			$redir = add_query_arg(array('spammed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'unspamcomment' :
-			wp_unspam_comment( $comment );
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
+			wp_unspam_comment($comment);
+			$redir = add_query_arg(array('unspammed' => '1'), $redir);
 			break;
 		case 'approvecomment' :
-			wp_set_comment_status( $comment, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+			wp_set_comment_status($comment, 'approve');
+			$redir = add_query_arg(array('approved' => 1), $redir);
 			break;
 		case 'unapprovecomment' :
-			wp_set_comment_status( $comment, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+			wp_set_comment_status($comment, 'hold');
+			$redir = add_query_arg(array('unapproved' => 1), $redir);
 			break;
 	}
 
-	wp_redirect( $redir );
+	wp_redirect($redir);
 	die;
 
 case 'editedcomment' :
 
-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+	$comment_id = absint($_POST['comment_ID']);
+	$comment_post_id = absint($_POST['comment_post_ID']);
 
-	check_admin_referer( 'update-comment_' . $comment_id );
+	check_admin_referer('update-comment_'.$comment_id);
 
 	edit_comment();
 
-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = (empty($_POST['referredby']) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby']).'#comment-'.$comment_id;
 
 	/**
 	 * Filters the URI the user is redirected to after editing a comment in the admin.
@@ -320,14 +320,14 @@ 
 	 * @param string $location The URI the user will be redirected to.
 	 * @param int $comment_id The ID of the comment being edited.
 	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+	$location = apply_filters('comment_edit_redirect', $location, $comment_id);
+	wp_redirect($location);
 
 	exit();
 
 default:
-	wp_die( __('Unknown action.') );
+	wp_die(__('Unknown action.'));
 
 } // end switch
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/options-permalink.php

Braces +36 added lines, -23 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
@@ -53,8 +54,9 @@ 
 $permalink_structure = get_option( 'permalink_structure' );
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite() ) {
 	$prefix = '/index.php';
+}
 
 /**
  * In a subdirectory configuration of multisite, the `/blog` prefix is used by
@@ -71,11 +73,12 @@ 
 $update_required     = false;
 
 if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
-		$writable = true;
-	else
-		$writable = false;
-} elseif ( $is_nginx ) {
+	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') ) {
+			$writable = true;
+	} else {
+			$writable = false;
+	}
+	} elseif ( $is_nginx ) {
 	$writable = false;
 } else {
 	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
@@ -94,17 +97,19 @@ 
 	check_admin_referer('update-permalink');
 
 	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
-			$permalink_structure = $_POST['selection'];
-		else
-			$permalink_structure = $_POST['permalink_structure'];
+		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) {
+					$permalink_structure = $_POST['selection'];
+		} else {
+					$permalink_structure = $_POST['permalink_structure'];
+		}
 
 		if ( ! empty( $permalink_structure ) ) {
 			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
-				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
-			else
-				$permalink_structure = $blog_prefix . $permalink_structure;
+			if ( $prefix && $blog_prefix ) {
+							$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+			} else {
+							$permalink_structure = $blog_prefix . $permalink_structure;
+			}
 		}
 
 		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
@@ -114,15 +119,17 @@ 
 
 	if ( isset( $_POST['category_base'] ) ) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		if ( ! empty( $category_base ) ) {
+					$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		}
 		$wp_rewrite->set_category_base( $category_base );
 	}
 
 	if ( isset( $_POST['tag_base'] ) ) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		if ( ! empty( $tag_base ) ) {
+					$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		}
 		$wp_rewrite->set_tag_base( $tag_base );
 	}
 
@@ -241,23 +248,29 @@ 
 	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
-		<?php else : ?>
+		<?php else {
+	: ?>
 <p><?php _e('If the root directory of your site were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
+	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) );
+}
+?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
 <?php elseif ( $is_nginx ) : ?>
 	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
-<?php else:
+<?php else {
+	:
 	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() );
+}
+?></textarea></p>
 </form>
 	<?php endif; ?>
 <?php endif; ?>

Spacing +95 added lines, -95 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
-		'<p>' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.').'</p>'.
+		'<p>'.__('This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'permalink-settings',
 	'title'   => __('Permalink Settings'),
-	'content' => '<p>' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '</p>' .
-		'<p>' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
-		'<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.').'</p>'.
+		'<p>'.__('If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.').'</p>'.
+		'<p>'.__('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'custom-structures',
 	'title'   => __('Custom Structures'),
-	'content' => '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Permalinks_Screen">Documentation on Permalinks Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Permalinks">Documentation on Using Permalinks</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Permalinks_Screen">Documentation on Permalinks Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Permalinks">Documentation on Using Permalinks</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
 add_filter('admin_head', 'options_permalink_add_js');
 
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
-$permalink_structure = get_option( 'permalink_structure' );
+$permalink_structure = get_option('permalink_structure');
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite())
 	$prefix = '/index.php';
 
 /**
@@ -62,149 +62,149 @@ 
  * network. If the `permalink_structure` option has been changed to remove this
  * base prefix, WordPress core can no longer account for the possible collision.
  */
-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
+if (is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos($permalink_structure, '/blog/')) {
 	$blog_prefix = '/blog';
 }
 
-$category_base       = get_option( 'category_base' );
-$tag_base            = get_option( 'tag_base' );
+$category_base       = get_option('category_base');
+$tag_base            = get_option('tag_base');
 $update_required     = false;
 
-if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
+if ($iis7_permalinks) {
+	if (( ! file_exists($home_path.'web.config') && win_is_writable($home_path)) || win_is_writable($home_path.'web.config'))
 		$writable = true;
 	else
 		$writable = false;
-} elseif ( $is_nginx ) {
+} elseif ($is_nginx) {
 	$writable = false;
 } else {
-	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
+	if (( ! file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')) {
 		$writable = true;
 	} else {
 		$writable = false;
-		$existing_rules  = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) );
-		$new_rules       = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) );
-		$update_required = ( $new_rules !== $existing_rules );
+		$existing_rules  = array_filter(extract_from_markers($home_path.'.htaccess', 'WordPress'));
+		$new_rules       = array_filter(explode("\n", $wp_rewrite->mod_rewrite_rules()));
+		$update_required = ($new_rules !== $existing_rules);
 	}
 }
 
 $using_index_permalinks = $wp_rewrite->using_index_permalinks();
 
-if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
+if (isset($_POST['permalink_structure']) || isset($_POST['category_base'])) {
 	check_admin_referer('update-permalink');
 
-	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
+	if (isset($_POST['permalink_structure'])) {
+		if (isset($_POST['selection']) && 'custom' != $_POST['selection'])
 			$permalink_structure = $_POST['selection'];
 		else
 			$permalink_structure = $_POST['permalink_structure'];
 
-		if ( ! empty( $permalink_structure ) ) {
-			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
-				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+		if ( ! empty($permalink_structure)) {
+			$permalink_structure = preg_replace('#/+#', '/', '/'.str_replace('#', '', $permalink_structure));
+			if ($prefix && $blog_prefix)
+				$permalink_structure = $prefix.preg_replace('#^/?index\.php#', '', $permalink_structure);
 			else
-				$permalink_structure = $blog_prefix . $permalink_structure;
+				$permalink_structure = $blog_prefix.$permalink_structure;
 		}
 
-		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
+		$permalink_structure = sanitize_option('permalink_structure', $permalink_structure);
 
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 	}
 
-	if ( isset( $_POST['category_base'] ) ) {
+	if (isset($_POST['category_base'])) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
-		$wp_rewrite->set_category_base( $category_base );
+		if ( ! empty($category_base))
+			$category_base = $blog_prefix.preg_replace('#/+#', '/', '/'.str_replace('#', '', $category_base));
+		$wp_rewrite->set_category_base($category_base);
 	}
 
-	if ( isset( $_POST['tag_base'] ) ) {
+	if (isset($_POST['tag_base'])) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
-		$wp_rewrite->set_tag_base( $tag_base );
+		if ( ! empty($tag_base))
+			$tag_base = $blog_prefix.preg_replace('#/+#', '/', '/'.str_replace('#', '', $tag_base));
+		$wp_rewrite->set_tag_base($tag_base);
 	}
 
-	$message = __( 'Permalink structure updated.' );
+	$message = __('Permalink structure updated.');
 
-	if ( $iis7_permalinks ) {
-		if ( $permalink_structure && ! $using_index_permalinks && ! $writable ) {
-			$message = __( 'You should update your web.config now.' );
-		} elseif ( $permalink_structure && ! $using_index_permalinks && $writable ) {
-			$message = __( 'Permalink structure updated. Remove write access on web.config file now!' );
+	if ($iis7_permalinks) {
+		if ($permalink_structure && ! $using_index_permalinks && ! $writable) {
+			$message = __('You should update your web.config now.');
+		} elseif ($permalink_structure && ! $using_index_permalinks && $writable) {
+			$message = __('Permalink structure updated. Remove write access on web.config file now!');
 		}
-	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
-		$message = __( 'You should update your .htaccess now.' );
+	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required) {
+		$message = __('You should update your .htaccess now.');
 	}
 
-	if ( ! get_settings_errors() ) {
-		add_settings_error( 'general', 'settings_updated', $message, 'updated' );
+	if ( ! get_settings_errors()) {
+		add_settings_error('general', 'settings_updated', $message, 'updated');
 	}
 
-	set_transient( 'settings_errors', get_settings_errors(), 30 );
+	set_transient('settings_errors', get_settings_errors(), 30);
 
-	wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
+	wp_redirect(admin_url('options-permalink.php?settings-updated=true'));
 	exit;
 }
 
 flush_rewrite_rules();
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 
-  <p><?php _e( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.' ); ?></p>
+  <p><?php _e('WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
-	$permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
-	$category_base = preg_replace( '|^/?blog|', '', $category_base );
-	$tag_base = preg_replace( '|^/?blog|', '', $tag_base );
+if (is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos($permalink_structure, '/blog/')) {
+	$permalink_structure = preg_replace('|^/?blog|', '', $permalink_structure);
+	$category_base = preg_replace('|^/?blog|', '', $category_base);
+	$tag_base = preg_replace('|^/?blog|', '', $tag_base);
 }
 
 $structures = array(
 	0 => '',
-	1 => $prefix . '/%year%/%monthnum%/%day%/%postname%/',
-	2 => $prefix . '/%year%/%monthnum%/%postname%/',
-	3 => $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
-	4 => $prefix . '/%postname%/',
+	1 => $prefix.'/%year%/%monthnum%/%day%/%postname%/',
+	2 => $prefix.'/%year%/%monthnum%/%postname%/',
+	3 => $prefix.'/'._x('archives', 'sample permalink base').'/%post_id%',
+	4 => $prefix.'/%postname%/',
 );
 ?>
 <h2 class="title"><?php _e('Common Settings'); ?></h2>
 <table class="form-table permalink-structure">
 	<tr>
-		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'Plain' ); ?></label></th>
+		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e('Plain'); ?></label></th>
 		<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'.date('Y').'/'.date('m').'/'.date('d').'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'.date('Y').'/'.date('m').'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'._x('archives', 'sample permalink base').'/123'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[4]); ?>" <?php checked($structures[4], $permalink_structure); ?> /> <?php _e('Post name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th>
-			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
+			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( ! in_array($permalink_structure, $structures)); ?> />
 			<?php _e('Custom Structure'); ?>
 			</label>
 		</th>
 		<td>
-			<code><?php echo get_option('home') . $blog_prefix; ?></code>
+			<code><?php echo get_option('home').$blog_prefix; ?></code>
 			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
 		</td>
 	</tr>
@@ -213,12 +213,12 @@ 
 <h2 class="title"><?php _e('Optional'); ?></h2>
 <p><?php
 /* translators: %s is a placeholder that must come at the start of the URL. */
-printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix ); ?></p>
+printf(__('If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.'), get_option('home').$blog_prefix.$prefix); ?></p>
 
 <table class="form-table">
 	<tr>
 		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
+		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr($category_base); ?>" class="regular-text code" /></td>
 	</tr>
 	<tr>
 		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
@@ -231,33 +231,33 @@ 
 
 <?php submit_button(); ?>
   </form>
-<?php if ( !is_multisite() ) { ?>
-<?php if ( $iis7_permalinks ) :
-	if ( isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
-		if ( file_exists($home_path . 'web.config') ) : ?>
+<?php if ( ! is_multisite()) { ?>
+<?php if ($iis7_permalinks) :
+	if (isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable) :
+		if (file_exists($home_path.'web.config')) : ?>
 <p><?php _e('If your <code>web.config</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->iis7_url_rewrite_rules()); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
 		<?php else : ?>
 <p><?php _e('If the root directory of your site were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
+	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
-<?php elseif ( $is_nginx ) : ?>
-	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
+<?php elseif ($is_nginx) : ?>
+	<p><?php _e('<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.'); ?></p>
 <?php else:
-	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
+	if ($permalink_structure && ! $using_index_permalinks && ! $writable && $update_required) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->mod_rewrite_rules()); ?></textarea></p>
 </form>
 	<?php endif; ?>
 <?php endif; ?>
@@ -265,4 +265,4 @@ 
 
 </div>
 
-<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-includes/ms-settings.php

Spacing +34 added lines, -34 removed lines

@@ -23,19 +23,19 @@ 
 global $current_site, $current_blog;
 
 /** WP_Network class */
-require_once( ABSPATH . WPINC . '/class-wp-network.php' );
+require_once(ABSPATH.WPINC.'/class-wp-network.php');
 
 /** WP_Site class */
-require_once( ABSPATH . WPINC . '/class-wp-site.php' );
+require_once(ABSPATH.WPINC.'/class-wp-site.php');
 
 /** Multisite loader */
-require_once( ABSPATH . WPINC . '/ms-load.php' );
+require_once(ABSPATH.WPINC.'/ms-load.php');
 
 /** Default Multisite constants */
-require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
+require_once(ABSPATH.WPINC.'/ms-default-constants.php');
 
-if ( defined( 'SUNRISE' ) ) {
-	include_once( WP_CONTENT_DIR . '/sunrise.php' );
+if (defined('SUNRISE')) {
+	include_once(WP_CONTENT_DIR.'/sunrise.php');
 }
 
 /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
@@ -43,50 +43,50 @@ 
 
 // This block will process a request if the current network or current site objects
 // have not been populated in the global scope through something like `sunrise.php`.
-if ( !isset( $current_site ) || !isset( $current_blog ) ) {
-
-	$domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
-	if ( substr( $domain, -3 ) == ':80' ) {
-		$domain = substr( $domain, 0, -3 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
-	} elseif ( substr( $domain, -4 ) == ':443' ) {
-		$domain = substr( $domain, 0, -4 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
+if ( ! isset($current_site) || ! isset($current_blog)) {
+
+	$domain = strtolower(stripslashes($_SERVER['HTTP_HOST']));
+	if (substr($domain, -3) == ':80') {
+		$domain = substr($domain, 0, -3);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -3);
+	} elseif (substr($domain, -4) == ':443') {
+		$domain = substr($domain, 0, -4);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -4);
 	}
 
-	$path = stripslashes( $_SERVER['REQUEST_URI'] );
-	if ( is_admin() ) {
-		$path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path );
+	$path = stripslashes($_SERVER['REQUEST_URI']);
+	if (is_admin()) {
+		$path = preg_replace('#(.*)/wp-admin/.*#', '$1/', $path);
 	}
-	list( $path ) = explode( '?', $path );
+	list($path) = explode('?', $path);
 
-	$bootstrap_result = ms_load_current_site_and_network( $domain, $path, is_subdomain_install() );
+	$bootstrap_result = ms_load_current_site_and_network($domain, $path, is_subdomain_install());
 
-	if ( true === $bootstrap_result ) {
+	if (true === $bootstrap_result) {
 		// `$current_blog` and `$current_site are now populated.
-	} elseif ( false === $bootstrap_result ) {
-		ms_not_installed( $domain, $path );
+	} elseif (false === $bootstrap_result) {
+		ms_not_installed($domain, $path);
 	} else {
-		header( 'Location: ' . $bootstrap_result );
+		header('Location: '.$bootstrap_result);
 		exit;
 	}
-	unset( $bootstrap_result );
+	unset($bootstrap_result);
 
 	$blog_id = $current_blog->blog_id;
 	$public  = $current_blog->public;
 
-	if ( empty( $current_blog->site_id ) ) {
+	if (empty($current_blog->site_id)) {
 		// This dates to [MU134] and shouldn't be relevant anymore,
 		// but it could be possible for arguments passed to insert_blog() etc.
 		$current_blog->site_id = 1;
 	}
 
 	$site_id = $current_blog->site_id;
-	wp_load_core_site_options( $site_id );
+	wp_load_core_site_options($site_id);
 }
 
-$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
-$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
+$wpdb->set_prefix($table_prefix, false); // $table_prefix can be set in sunrise.php
+$wpdb->set_blog_id($current_blog->blog_id, $current_blog->site_id);
 $table_prefix = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
 $switched = false;
@@ -94,12 +94,12 @@ 
 // need to init cache again after blog_id is set
 wp_start_object_cache();
 
-if ( ! $current_site instanceof WP_Network ) {
-	$current_site = new WP_Network( $current_site );
+if ( ! $current_site instanceof WP_Network) {
+	$current_site = new WP_Network($current_site);
 }
 
-if ( ! $current_blog instanceof WP_Site ) {
-	$current_blog = new WP_Site( $current_blog );
+if ( ! $current_blog instanceof WP_Site) {
+	$current_blog = new WP_Site($current_blog);
 }
 
 // Define upload directory constants
@@ -111,4 +111,4 @@ 
  *
  * @since 4.6.0
  */
-do_action( 'ms_loaded' );
+do_action('ms_loaded');

src/wp-includes/class-wp-admin-bar.php

Spacing +178 added lines, -178 removed lines

@@ -21,13 +21,13 @@ 
 	 * @param string $name
 	 * @return string|array|void
 	 */
-	public function __get( $name ) {
-		switch ( $name ) {
+	public function __get($name) {
+		switch ($name) {
 			case 'proto' :
 				return is_ssl() ? 'https://' : 'http://';
 
 			case 'menu' :
-				_deprecated_argument( 'WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
+				_deprecated_argument('WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.');
 				return array(); // Sorry, folks.
 		}
 	}
@@ -38,61 +38,61 @@ 
 	public function initialize() {
 		$this->user = new stdClass;
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			/* Populate settings we need for the menu based on the current user. */
-			$this->user->blogs = get_blogs_of_user( get_current_user_id() );
-			if ( is_multisite() ) {
-				$this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-				$this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+			$this->user->blogs = get_blogs_of_user(get_current_user_id());
+			if (is_multisite()) {
+				$this->user->active_blog = get_active_blog_for_user(get_current_user_id());
+				$this->user->domain = empty($this->user->active_blog) ? user_admin_url() : trailingslashit(get_home_url($this->user->active_blog->blog_id));
 				$this->user->account_domain = $this->user->domain;
 			} else {
 				$this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-				$this->user->domain = trailingslashit( home_url() );
+				$this->user->domain = trailingslashit(home_url());
 				$this->user->account_domain = $this->user->domain;
 			}
 		}
 
-		add_action( 'wp_head', 'wp_admin_bar_header' );
+		add_action('wp_head', 'wp_admin_bar_header');
 
-		add_action( 'admin_head', 'wp_admin_bar_header' );
+		add_action('admin_head', 'wp_admin_bar_header');
 
-		if ( current_theme_supports( 'admin-bar' ) ) {
+		if (current_theme_supports('admin-bar')) {
 			/**
 			 * To remove the default padding styles from WordPress for the Toolbar, use the following code:
 			 * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
 			 */
-			$admin_bar_args = get_theme_support( 'admin-bar' );
+			$admin_bar_args = get_theme_support('admin-bar');
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
+		if (empty($header_callback))
 			$header_callback = '_admin_bar_bump_cb';
 
 		add_action('wp_head', $header_callback);
 
-		wp_enqueue_script( 'admin-bar' );
-		wp_enqueue_style( 'admin-bar' );
+		wp_enqueue_script('admin-bar');
+		wp_enqueue_style('admin-bar');
 
 		/**
 		 * Fires after WP_Admin_Bar is initialized.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'admin_bar_init' );
+		do_action('admin_bar_init');
 	}
 
 	/**
 	 * @param array $node
 	 */
-	public function add_menu( $node ) {
-		$this->add_node( $node );
+	public function add_menu($node) {
+		$this->add_node($node);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	public function remove_menu( $id ) {
-		$this->remove_node( $id );
+	public function remove_menu($id) {
+		$this->remove_node($id);
 	}
 
 	/**
@@ -114,22 +114,22 @@ 
 	 *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
 	 * }
 	 */
-	public function add_node( $args ) {
+	public function add_node($args) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if (func_num_args() >= 3 && is_string(func_get_arg(0)))
+			$args = array_merge(array('parent' => func_get_arg(0)), func_get_arg(2));
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if (is_object($args))
+			$args = get_object_vars($args);
 
 		// Ensure we have a valid title.
-		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
+		if (empty($args['id'])) {
+			if (empty($args['title']))
 				return;
 
-			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3.0' );
+			_doing_it_wrong(__METHOD__, __('The menu ID should not be empty.'), '3.3.0');
 			// Deprecated: Generate an ID from the title.
-			$args['id'] = esc_attr( sanitize_title( trim( $args['title'] ) ) );
+			$args['id'] = esc_attr(sanitize_title(trim($args['title'])));
 		}
 
 		$defaults = array(
@@ -142,34 +142,34 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ($maybe_defaults = $this->get_node($args['id']))
+			$defaults = get_object_vars($maybe_defaults);
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty($defaults['meta']) && ! empty($args['meta']))
+			$args['meta'] = wp_parse_args($args['meta'], $defaults['meta']);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$back_compat_parents = array(
-			'my-account-with-avatar' => array( 'my-account', '3.3' ),
-			'my-blogs'               => array( 'my-sites',   '3.3' ),
+			'my-account-with-avatar' => array('my-account', '3.3'),
+			'my-blogs'               => array('my-sites', '3.3'),
 		);
 
-		if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
-			list( $new_parent, $version ) = $back_compat_parents[ $args['parent'] ];
-			_deprecated_argument( __METHOD__, $version, sprintf( 'Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent'] ) );
+		if (isset($back_compat_parents[$args['parent']])) {
+			list($new_parent, $version) = $back_compat_parents[$args['parent']];
+			_deprecated_argument(__METHOD__, $version, sprintf('Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent']));
 			$args['parent'] = $new_parent;
 		}
 
-		$this->_set_node( $args );
+		$this->_set_node($args);
 	}
 
 	/**
 	 * @param array $args
 	 */
-	final protected function _set_node( $args ) {
-		$this->nodes[ $args['id'] ] = (object) $args;
+	final protected function _set_node($args) {
+		$this->nodes[$args['id']] = (object) $args;
 	}
 
 	/**
@@ -178,8 +178,8 @@ 
 	 * @param string $id
 	 * @return object Node.
 	 */
-	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
+	final public function get_node($id) {
+		if ($node = $this->_get_node($id))
 			return clone $node;
 	}
 
@@ -187,25 +187,25 @@ 
 	 * @param string $id
 	 * @return object|void
 	 */
-	final protected function _get_node( $id ) {
-		if ( $this->bound )
+	final protected function _get_node($id) {
+		if ($this->bound)
 			return;
 
-		if ( empty( $id ) )
+		if (empty($id))
 			$id = 'root';
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if (isset($this->nodes[$id]))
+			return $this->nodes[$id];
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
+		if ( ! $nodes = $this->_get_nodes())
 			return;
 
-		foreach ( $nodes as &$node ) {
+		foreach ($nodes as &$node) {
 			$node = clone $node;
 		}
 		return $nodes;
@@ -215,7 +215,7 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		return $this->nodes;
@@ -235,10 +235,10 @@ 
 	 *                         'class', 'onclick', 'target', and 'title'.
 	 * }
 	 */
-	final public function add_group( $args ) {
+	final public function add_group($args) {
 		$args['group'] = true;
 
-		$this->add_node( $args );
+		$this->add_node($args);
 	}
 
 	/**
@@ -246,15 +246,15 @@ 
 	 *
 	 * @param string $id The ID of the item.
 	 */
-	public function remove_node( $id ) {
-		$this->_unset_node( $id );
+	public function remove_node($id) {
+		$this->_unset_node($id);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	final protected function _unset_node( $id ) {
-		unset( $this->nodes[ $id ] );
+	final protected function _unset_node($id) {
+		unset($this->nodes[$id]);
 	}
 
 	/**
@@ -262,66 +262,66 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ($root)
+			$this->_render($root);
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
-		$this->remove_node( 'root' );
-		$this->add_node( array(
+		$this->remove_node('root');
+		$this->add_node(array(
 			'id'    => 'root',
 			'group' => false,
-		) );
+		));
 
 		// Normalize nodes: define internal 'children' and 'type' properties.
-		foreach ( $this->_get_nodes() as $node ) {
+		foreach ($this->_get_nodes() as $node) {
 			$node->children = array();
-			$node->type = ( $node->group ) ? 'group' : 'item';
-			unset( $node->group );
+			$node->type = ($node->group) ? 'group' : 'item';
+			unset($node->group);
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
+			if ( ! $node->parent)
 				$node->parent = 'root';
 		}
 
-		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
+		foreach ($this->_get_nodes() as $node) {
+			if ('root' == $node->id)
 				continue;
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
-			if ( ! $parent = $this->_get_node( $node->parent ) ) {
+			if ( ! $parent = $this->_get_node($node->parent)) {
 				continue;
 			}
 
 			// Generate the group class (we distinguish between top level and other level groups).
-			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
+			$group_class = ($node->parent == 'root') ? 'ab-top-menu' : 'ab-submenu';
 
-			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
+			if ($node->type == 'group') {
+				if (empty($node->meta['class']))
 					$node->meta['class'] = $group_class;
 				else
-					$node->meta['class'] .= ' ' . $group_class;
+					$node->meta['class'] .= ' '.$group_class;
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
-			if ( $parent->type == 'item' && $node->type == 'item' ) {
-				$default_id = $parent->id . '-default';
-				$default    = $this->_get_node( $default_id );
+			if ($parent->type == 'item' && $node->type == 'item') {
+				$default_id = $parent->id.'-default';
+				$default    = $this->_get_node($default_id);
 
 				// The default group is added here to allow groups that are
 				// added before standard menu items to render first.
-				if ( ! $default ) {
+				if ( ! $default) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'        => $default_id,
 						'parent'    => $parent->id,
 						'type'      => 'group',
@@ -331,45 +331,45 @@ 
 						),
 						'title'     => false,
 						'href'      => false,
-					) );
-					$default = $this->_get_node( $default_id );
+					));
+					$default = $this->_get_node($default_id);
 					$parent->children[] = $default;
 				}
 				$parent = $default;
 
 			// Groups in groups aren't allowed. Add a special 'container' node.
 			// The container will invisibly wrap both groups.
-			} elseif ( $parent->type == 'group' && $node->type == 'group' ) {
-				$container_id = $parent->id . '-container';
-				$container    = $this->_get_node( $container_id );
+			} elseif ($parent->type == 'group' && $node->type == 'group') {
+				$container_id = $parent->id.'-container';
+				$container    = $this->_get_node($container_id);
 
 				// We need to create a container for this group, life is sad.
-				if ( ! $container ) {
+				if ( ! $container) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'       => $container_id,
 						'type'     => 'container',
-						'children' => array( $parent ),
+						'children' => array($parent),
 						'parent'   => false,
 						'title'    => false,
 						'href'     => false,
 						'meta'     => array(),
-					) );
+					));
 
-					$container = $this->_get_node( $container_id );
+					$container = $this->_get_node($container_id);
 
 					// Link the container node if a grandparent node exists.
-					$grandparent = $this->_get_node( $parent->parent );
+					$grandparent = $this->_get_node($parent->parent);
 
-					if ( $grandparent ) {
+					if ($grandparent) {
 						$container->parent = $grandparent->id;
 
-						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
+						$index = array_search($parent, $grandparent->children, true);
+						if ($index === false)
 							$grandparent->children[] = $container;
 						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+							array_splice($grandparent->children, $index, 1, array($container));
 					}
 
 					$parent->parent = $container->id;
@@ -385,7 +385,7 @@ 
 			$parent->children[] = $node;
 		}
 
-		$root = $this->_get_node( 'root' );
+		$root = $this->_get_node('root');
 		$this->bound = true;
 		return $root;
 	}
@@ -395,35 +395,35 @@ 
 	 * @global bool $is_IE
 	 * @param object $root
 	 */
-	final protected function _render( $root ) {
+	final protected function _render($root) {
 		global $is_IE;
 
 		// Add browser classes.
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
-		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+		if ($is_IE) {
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7'))
 				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8'))
 				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 9'))
 				$class .= ' ie9';
-		} elseif ( wp_is_mobile() ) {
+		} elseif (wp_is_mobile()) {
 			$class .= ' mobile';
 		}
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>">
-			<?php if ( ! is_admin() ) { ?>
-				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+			<?php if ( ! is_admin()) { ?>
+				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
 			<?php } ?>
-			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
-				<?php foreach ( $root->children as $group ) {
-					$this->_render_group( $group );
+			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Toolbar'); ?>" tabindex="0">
+				<?php foreach ($root->children as $group) {
+					$this->_render_group($group);
 				} ?>
 			</div>
-			<?php if ( is_user_logged_in() ) : ?>
-			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
+			<?php if (is_user_logged_in()) : ?>
+			<a class="screen-reader-shortcut" href="<?php echo esc_url(wp_logout_url()); ?>"><?php _e('Log Out'); ?></a>
 			<?php endif; ?>
 		</div>
 
@@ -433,13 +433,13 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
+	final protected function _render_container($node) {
+		if ($node->type != 'container' || empty($node->children))
 			return;
 
-		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
-			foreach ( $node->children as $group ) {
-				$this->_render_group( $group );
+		?><div id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>" class="ab-group-container"><?php
+			foreach ($node->children as $group) {
+				$this->_render_group($group);
 			}
 		?></div><?php
 	}
@@ -447,22 +447,22 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_group( $node ) {
-		if ( $node->type == 'container' ) {
-			$this->_render_container( $node );
+	final protected function _render_group($node) {
+		if ($node->type == 'container') {
+			$this->_render_container($node);
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
+		if ($node->type != 'group' || empty($node->children))
 			return;
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		if ( ! empty($node->meta['class']))
+			$class = ' class="'.esc_attr(trim($node->meta['class'])).'"';
 		else
 			$class = '';
 
-		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
-			foreach ( $node->children as $item ) {
-				$this->_render_item( $item );
+		?><ul id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $class; ?>><?php
+			foreach ($node->children as $item) {
+				$this->_render_item($item);
 			}
 		?></ul><?php
 	}
@@ -470,85 +470,85 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
+	final protected function _render_item($node) {
+		if ($node->type != 'item')
 			return;
 
-		$is_parent = ! empty( $node->children );
-		$has_link  = ! empty( $node->href );
+		$is_parent = ! empty($node->children);
+		$has_link  = ! empty($node->href);
 
 		// Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y.
-		$tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
-		$aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
+		$tabindex = (isset($node->meta['tabindex']) && is_numeric($node->meta['tabindex'])) ? (int) $node->meta['tabindex'] : '';
+		$aria_attributes = ('' !== $tabindex) ? ' tabindex="'.$tabindex.'"' : '';
 
 		$menuclass = '';
 
-		if ( $is_parent ) {
+		if ($is_parent) {
 			$menuclass = 'menupop ';
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty($node->meta['class']))
 			$menuclass .= $node->meta['class'];
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ($menuclass)
+			$menuclass = ' class="'.esc_attr(trim($menuclass)).'"';
 
 		?>
 
-		<li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
-			if ( $has_link ):
-				?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
-					if ( ! empty( $node->meta['onclick'] ) ) :
-						?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+		<li id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $menuclass; ?>><?php
+			if ($has_link):
+				?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url($node->href) ?>"<?php
+					if ( ! empty($node->meta['onclick'])) :
+						?> onclick="<?php echo esc_js($node->meta['onclick']); ?>"<?php
 					endif;
-				if ( ! empty( $node->meta['target'] ) ) :
-					?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+				if ( ! empty($node->meta['target'])) :
+					?> target="<?php echo esc_attr($node->meta['target']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['rel'] ) ) :
-					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+				if ( ! empty($node->meta['rel'])) :
+					?> rel="<?php echo esc_attr($node->meta['rel']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			else:
 				?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			endif;
 
 			echo $node->title;
 
-			if ( $has_link ) :
+			if ($has_link) :
 				?></a><?php
 			else:
 				?></div><?php
 			endif;
 
-			if ( $is_parent ) :
+			if ($is_parent) :
 				?><div class="ab-sub-wrapper"><?php
-					foreach ( $node->children as $group ) {
-						$this->_render_group( $group );
+					foreach ($node->children as $group) {
+						$this->_render_group($group);
 					}
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
+			if ( ! empty($node->meta['html']))
 				echo $node->meta['html'];
 
 			?>
@@ -559,9 +559,9 @@ 
 	 * @param string $id    Unused.
 	 * @param object $node
 	 */
-	public function recursive_render( $id, $node ) {
-		_deprecated_function( __METHOD__, '3.3.0', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
-		$this->_render_item( $node );
+	public function recursive_render($id, $node) {
+		_deprecated_function(__METHOD__, '3.3.0', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()');
+		$this->_render_item($node);
 	}
 
 	/**
@@ -569,32 +569,32 @@ 
 	 */
 	public function add_menus() {
 		// User related, aligned right.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_menu', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_search_menu', 4);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_item', 7);
 
 		// Site related.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
+		add_action('admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_wp_menu', 10);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20);
+		add_action('admin_bar_menu', 'wp_admin_bar_site_menu', 30);
+		add_action('admin_bar_menu', 'wp_admin_bar_customize_menu', 40);
+		add_action('admin_bar_menu', 'wp_admin_bar_updates_menu', 50);
 
 		// Content related.
-		if ( ! is_network_admin() && ! is_user_admin() ) {
-			add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
-			add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+		if ( ! is_network_admin() && ! is_user_admin()) {
+			add_action('admin_bar_menu', 'wp_admin_bar_comments_menu', 60);
+			add_action('admin_bar_menu', 'wp_admin_bar_new_content_menu', 70);
 		}
-		add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		add_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 
-		add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
+		add_action('admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200);
 
 		/**
 		 * Fires after menus are added to the menu bar.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'add_admin_bar_menus' );
+		do_action('add_admin_bar_menus');
 	}
 }

Braces +94 added lines, -64 removed lines

@@ -65,8 +65,9 @@ 
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
-			$header_callback = '_admin_bar_bump_cb';
+		if ( empty($header_callback) ) {
+					$header_callback = '_admin_bar_bump_cb';
+		}
 
 		add_action('wp_head', $header_callback);
 
@@ -116,16 +117,19 @@ 
 	 */
 	public function add_node( $args ) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) ) {
+					$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		}
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if ( is_object( $args ) ) {
+					$args = get_object_vars( $args );
+		}
 
 		// Ensure we have a valid title.
 		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
-				return;
+			if ( empty( $args['title'] ) ) {
+							return;
+			}
 
 			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3.0' );
 			// Deprecated: Generate an ID from the title.
@@ -142,12 +146,14 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ( $maybe_defaults = $this->get_node( $args['id'] ) ) {
+					$defaults = get_object_vars( $maybe_defaults );
+		}
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) ) {
+					$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		}
 
 		$args = wp_parse_args( $args, $defaults );
 
@@ -179,8 +185,9 @@ 
 	 * @return object Node.
 	 */
 	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
-			return clone $node;
+		if ( $node = $this->_get_node( $id ) ) {
+					return clone $node;
+		}
 	}
 
 	/**
@@ -188,22 +195,26 @@ 
 	 * @return object|void
 	 */
 	final protected function _get_node( $id ) {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
-		if ( empty( $id ) )
-			$id = 'root';
+		if ( empty( $id ) ) {
+					$id = 'root';
+		}
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if ( isset( $this->nodes[ $id ] ) ) {
+					return $this->nodes[ $id ];
+		}
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
-			return;
+		if ( ! $nodes = $this->_get_nodes() ) {
+					return;
+		}
 
 		foreach ( $nodes as &$node ) {
 			$node = clone $node;
@@ -215,8 +226,9 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		return $this->nodes;
 	}
@@ -262,16 +274,18 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ( $root ) {
+					$this->_render( $root );
+		}
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
@@ -288,13 +302,15 @@ 
 			unset( $node->group );
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
-				$node->parent = 'root';
+			if ( ! $node->parent ) {
+							$node->parent = 'root';
+			}
 		}
 
 		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
-				continue;
+			if ( 'root' == $node->id ) {
+							continue;
+			}
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
 			if ( ! $parent = $this->_get_node( $node->parent ) ) {
@@ -305,10 +321,11 @@ 
 			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
 
 			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
-					$node->meta['class'] = $group_class;
-				else
-					$node->meta['class'] .= ' ' . $group_class;
+				if ( empty( $node->meta['class'] ) ) {
+									$node->meta['class'] = $group_class;
+				} else {
+									$node->meta['class'] .= ' ' . $group_class;
+				}
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
@@ -366,10 +383,11 @@ 
 						$container->parent = $grandparent->id;
 
 						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
-							$grandparent->children[] = $container;
-						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+						if ( $index === false ) {
+													$grandparent->children[] = $container;
+						} else {
+													array_splice( $grandparent->children, $index, 1, array( $container ) );
+						}
 					}
 
 					$parent->parent = $container->id;
@@ -402,12 +420,13 @@ 
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
 		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
-				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
-				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
-				$class .= ' ie9';
+			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) {
+							$class .= ' ie7';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) {
+							$class .= ' ie8';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) {
+							$class .= ' ie9';
+			}
 		} elseif ( wp_is_mobile() ) {
 			$class .= ' mobile';
 		}
@@ -434,8 +453,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'container' || empty( $node->children ) ) {
+					return;
+		}
 
 		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
 			foreach ( $node->children as $group ) {
@@ -452,13 +472,15 @@ 
 			$this->_render_container( $node );
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'group' || empty( $node->children ) ) {
+					return;
+		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
-		else
-			$class = '';
+		if ( ! empty( $node->meta['class'] ) ) {
+					$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		} else {
+					$class = '';
+		}
 
 		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
 			foreach ( $node->children as $item ) {
@@ -471,8 +493,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
-			return;
+		if ( $node->type != 'item' ) {
+					return;
+		}
 
 		$is_parent = ! empty( $node->children );
 		$has_link  = ! empty( $node->href );
@@ -488,11 +511,13 @@ 
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$menuclass .= $node->meta['class'];
+		if ( ! empty( $node->meta['class'] ) ) {
+					$menuclass .= $node->meta['class'];
+		}
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ( $menuclass ) {
+					$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		}
 
 		?>
 
@@ -518,8 +543,10 @@ 
 					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
 				endif;
 				?>><?php
-			else:
+			else {
+				:
 				?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
+			}
 				if ( ! empty( $node->meta['title'] ) ) :
 					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
 				endif;
@@ -536,9 +563,11 @@ 
 
 			if ( $has_link ) :
 				?></a><?php
-			else:
+			else {
+				:
 				?></div><?php
 			endif;
+			}
 
 			if ( $is_parent ) :
 				?><div class="ab-sub-wrapper"><?php
@@ -548,8 +577,9 @@ 
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
-				echo $node->meta['html'];
+			if ( ! empty( $node->meta['html'] ) ) {
+							echo $node->meta['html'];
+			}
 
 			?>
 		</li><?php

src/wp-includes/embed-template.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  * @deprecated 4.5.0 Moved to wp-includes/theme-compat/embed.php
  */
 
-_deprecated_file( basename( __FILE__ ), '4.5.0', 'wp-includes/theme-compat/embed.php' );
+_deprecated_file(basename(__FILE__), '4.5.0', 'wp-includes/theme-compat/embed.php');
 
-include( ABSPATH . WPINC . '/theme-compat/embed.php' );
+include(ABSPATH.WPINC.'/theme-compat/embed.php');

src/wp-includes/rss-functions.php

Spacing +2 added lines, -2 removed lines

@@ -5,5 +5,5 @@
  * @package WordPress
  */
 
-_deprecated_file( basename(__FILE__), '2.1.0', WPINC . '/rss.php' );
-require_once( ABSPATH . WPINC . '/rss.php' );
+_deprecated_file(basename(__FILE__), '2.1.0', WPINC.'/rss.php');
+require_once(ABSPATH.WPINC.'/rss.php');

src/wp-includes/pluggable-deprecated.php

Spacing +26 added lines, -26 removed lines

@@ -15,7 +15,7 @@ 
  * Deprecated functions come here to die.
  */
 
-if ( !function_exists('set_current_user') ) :
+if ( ! function_exists('set_current_user')) :
 /**
  * Changes the current user by ID or name.
  *
@@ -30,12 +30,12 @@ 
  * @return WP_User returns wp_set_current_user()
  */
 function set_current_user($id, $name = '') {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_set_current_user()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_set_current_user()');
 	return wp_set_current_user($id, $name);
 }
 endif;
 
-if ( !function_exists('get_currentuserinfo') ) :
+if ( ! function_exists('get_currentuserinfo')) :
 /**
  * Populate global variables with information about the currently logged in user.
  *
@@ -46,13 +46,13 @@ 
  * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
  */
 function get_currentuserinfo() {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'wp_get_current_user()' );
+	_deprecated_function(__FUNCTION__, '4.5.0', 'wp_get_current_user()');
 
 	return _wp_get_current_user();
 }
 endif;
 
-if ( !function_exists('get_userdatabylogin') ) :
+if ( ! function_exists('get_userdatabylogin')) :
 /**
  * Retrieve user info by login name.
  *
@@ -64,12 +64,12 @@ 
  * @return bool|object False on failure, User DB row object
  */
 function get_userdatabylogin($user_login) {
-	_deprecated_function( __FUNCTION__, '3.3.0', "get_user_by('login')" );
+	_deprecated_function(__FUNCTION__, '3.3.0', "get_user_by('login')");
 	return get_user_by('login', $user_login);
 }
 endif;
 
-if ( !function_exists('get_user_by_email') ) :
+if ( ! function_exists('get_user_by_email')) :
 /**
  * Retrieve user info by email.
  *
@@ -81,12 +81,12 @@ 
  * @return bool|object False on failure, User DB row object
  */
 function get_user_by_email($email) {
-	_deprecated_function( __FUNCTION__, '3.3.0', "get_user_by('email')" );
+	_deprecated_function(__FUNCTION__, '3.3.0', "get_user_by('email')");
 	return get_user_by('email', $email);
 }
 endif;
 
-if ( !function_exists('wp_setcookie') ) :
+if ( ! function_exists('wp_setcookie')) :
 /**
  * Sets a cookie for a user who just logged in. This function is deprecated.
  *
@@ -102,15 +102,15 @@ 
  * @param bool $remember Optional. Remember that the user is logged in
  */
 function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_set_auth_cookie()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_set_auth_cookie()');
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
 }
 else :
-	_deprecated_function( 'wp_setcookie', '2.5.0', 'wp_set_auth_cookie()' );
+	_deprecated_function('wp_setcookie', '2.5.0', 'wp_set_auth_cookie()');
 endif;
 
-if ( !function_exists('wp_clearcookie') ) :
+if ( ! function_exists('wp_clearcookie')) :
 /**
  * Clears the authentication cookie, logging the user out. This function is deprecated.
  *
@@ -119,14 +119,14 @@ 
  * @see wp_clear_auth_cookie()
  */
 function wp_clearcookie() {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()');
 	wp_clear_auth_cookie();
 }
 else :
-	_deprecated_function( 'wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()' );
+	_deprecated_function('wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()');
 endif;
 
-if ( !function_exists('wp_get_cookie_login') ):
+if ( ! function_exists('wp_get_cookie_login')):
 /**
  * Gets the user cookie login. This function is deprecated.
  *
@@ -139,14 +139,14 @@ 
  * @return bool Always returns false
  */
 function wp_get_cookie_login() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 	return false;
 }
 else :
-	_deprecated_function( 'wp_get_cookie_login', '2.5.0' );
+	_deprecated_function('wp_get_cookie_login', '2.5.0');
 endif;
 
-if ( !function_exists('wp_login') ) :
+if ( ! function_exists('wp_login')) :
 /**
  * Checks a users login information and logs them in if it checks out. This function is deprecated.
  *
@@ -169,19 +169,19 @@ 
  * @return bool False on login failure, true on successful check
  */
 function wp_login($username, $password, $deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_signon()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_signon()');
 	global $error;
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
+	if ( ! is_wp_error($user))
 		return true;
 
 	$error = $user->get_error_message();
 	return false;
 }
 else :
-	_deprecated_function( 'wp_login', '2.5.0', 'wp_signon()' );
+	_deprecated_function('wp_login', '2.5.0', 'wp_signon()');
 endif;
 
 /**
@@ -195,14 +195,14 @@ 
  *
  * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
-if ( ! class_exists( 'wp_atom_server', false ) ) {
+if ( ! class_exists('wp_atom_server', false)) {
 	class wp_atom_server {
-		public function __call( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5.0', 'the Atom Publishing Protocol plugin' );
+		public function __call($name, $arguments) {
+			_deprecated_function(__CLASS__.'::'.$name, '3.5.0', 'the Atom Publishing Protocol plugin');
 		}
 
-		public static function __callStatic( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5.0', 'the Atom Publishing Protocol plugin' );
+		public static function __callStatic($name, $arguments) {
+			_deprecated_function(__CLASS__.'::'.$name, '3.5.0', 'the Atom Publishing Protocol plugin');
 		}
 	}
 }

Braces +15 added lines, -10 removed lines

@@ -105,9 +105,10 @@ 
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_set_auth_cookie()' );
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_setcookie', '2.5.0', 'wp_set_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_clearcookie') ) :
@@ -121,9 +122,10 @@ 
 function wp_clearcookie() {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()' );
 	wp_clear_auth_cookie();
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_get_cookie_login') ):
@@ -141,9 +143,10 @@ 
 function wp_get_cookie_login() {
 	_deprecated_function( __FUNCTION__, '2.5.0' );
 	return false;
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_get_cookie_login', '2.5.0' );
+}
 endif;
 
 if ( !function_exists('wp_login') ) :
@@ -174,14 +177,16 @@ 
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
-		return true;
+	if ( ! is_wp_error($user) ) {
+			return true;
+	}
 
 	$error = $user->get_error_message();
 	return false;
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_login', '2.5.0', 'wp_signon()' );
+}
 endif;
 
 /**

src/wp-includes/customize/class-wp-customize-nav-menu-location-control.php

Spacing +7 added lines, -7 removed lines

@@ -56,28 +56,28 @@
 	 * @access public
 	 */
 	public function render_content() {
-		if ( empty( $this->choices ) ) {
+		if (empty($this->choices)) {
 			return;
 		}
 		?>
 		<label>
-			<?php if ( ! empty( $this->label ) ) : ?>
-			<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php if ( ! empty($this->label)) : ?>
+			<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 			<?php endif; ?>
 
-			<?php if ( ! empty( $this->description ) ) : ?>
+			<?php if ( ! empty($this->description)) : ?>
 			<span class="description customize-control-description"><?php echo $this->description; ?></span>
 			<?php endif; ?>
 
 			<select <?php $this->link(); ?>>
 				<?php
-				foreach ( $this->choices as $value => $label ) :
-					echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+				foreach ($this->choices as $value => $label) :
+					echo '<option value="'.esc_attr($value).'"'.selected($this->value(), $value, false).'>'.$label.'</option>';
 				endforeach;
 				?>
 			</select>
 		</label>
-		<button type="button" class="button-link edit-menu<?php if ( ! $this->value() ) { echo ' hidden'; } ?>" aria-label="<?php esc_attr_e( 'Edit selected menu' ); ?>"><?php _e( 'Edit Menu' ); ?></button>
+		<button type="button" class="button-link edit-menu<?php if ( ! $this->value()) { echo ' hidden'; } ?>" aria-label="<?php esc_attr_e('Edit selected menu'); ?>"><?php _e('Edit Menu'); ?></button>
 		<?php
 	}
 }

src/wp-includes/customize/class-wp-customize-nav-menu-section.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	public function json() {
 		$exported = parent::json();
-		$exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(-?\d+)\]/', '$1', $this->id ) );
+		$exported['menu_id'] = intval(preg_replace('/^nav_menu\[(-?\d+)\]/', '$1', $this->id));
 
 		return $exported;
 	}