ntwb / wordpress

src/wp-admin/network/user-new.php

Indentation +6 added lines, -6 removed lines

@@ -52,12 +52,12 @@
 	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
 		} else {
 			/**
-			  * Fires after a new user has been created via the network user-new.php page.
-			  *
-			  * @since 4.4.0
-			  *
-			  * @param int $user_id ID of the newly created user.
-			  */
+			 * Fires after a new user has been created via the network user-new.php page.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @param int $user_id ID of the newly created user.
+			 */
 			do_action( 'network_user_new_created_user', $user_id );
 			wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
 			exit;

Spacing +48 added lines, -48 removed lines

@@ -8,45 +8,45 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users'))
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
-		'<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
-) );
+		'<p>'.__('Add User will set up a new user account on the network and send that person an email with username and password.').'</p>'.
+		'<p>'.__('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can('manage_network_users'))
+		wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array($_POST['user']))
+		wp_die(__('Cannot create an empty user.'));
 
-	$user = wp_unslash( $_POST['user'] );
+	$user = wp_unslash($_POST['user']);
 
-	$user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
-	if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
-		$add_user_errors = $user_details[ 'errors' ];
+	$user_details = wpmu_validate_user_signup($user['username'], $user['email']);
+	if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+		$add_user_errors = $user_details['errors'];
 	} else {
-		$password = wp_generate_password( 12, false);
-		$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user(esc_html(strtolower($user['username'])), $password, sanitize_email($user['email']));
 
-		if ( ! $user_id ) {
-	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+		if ( ! $user_id) {
+	 		$add_user_errors = new WP_Error('add_user_fail', __('Cannot add user.'));
 		} else {
 			/**
 			  * Fires after a new user has been created via the network user-new.php page.
@@ -55,29 +55,29 @@ 
 			  *
 			  * @param int $user_id ID of the newly created user.
 			  */
-			do_action( 'network_user_new_created_user', $user_id );
-			wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
+			do_action('network_user_new_created_user', $user_id);
+			wp_redirect(add_query_arg(array('update' => 'added', 'user_id' => $user_id), 'user-new.php'));
 			exit;
 		}
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] ) {
+	if ('added' == $_GET['update']) {
 		$edit_link = '';
-		if ( isset( $_GET['user_id'] ) ) {
-			$user_id_new = absint( $_GET['user_id'] );
-			if ( $user_id_new ) {
-				$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+		if (isset($_GET['user_id'])) {
+			$user_id_new = absint($_GET['user_id']);
+			if ($user_id_new) {
+				$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_id_new)));
 			}
 		}
 
-		if ( empty( $edit_link ) ) {
-			$messages[] = __( 'User added.' );
+		if (empty($edit_link)) {
+			$messages[] = __('User added.');
 		} else {
 			/* translators: %s: edit page url */
-			$messages[] = sprintf( __( 'User added. <a href="%s">Edit user</a>' ), $edit_link );
+			$messages[] = sprintf(__('User added. <a href="%s">Edit user</a>'), $edit_link);
 		}
 	}
 }
@@ -85,20 +85,20 @@ 
 $title = __('Add New User');
 $parent_file = 'users.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
+<h1 id="add-new-user"><?php _e('Add New User'); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 }
 
-if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
+if (isset($add_user_errors) && is_wp_error($add_user_errors)) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -106,15 +106,15 @@ 
 	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="email"><?php _e('Email') ?></label></th>
 			<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2"><?php _e('A password reset link will be sent to the user via email.') ?></td>
 		</tr>
 	</table>
 	<?php
@@ -123,12 +123,12 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	do_action( 'network_user_new_form' );
+	do_action('network_user_new_form');
 
-	wp_nonce_field( 'add-user', '_wpnonce_add-user' );
-	submit_button( __('Add User'), 'primary', 'add-user' );
+	wp_nonce_field('add-user', '_wpnonce_add-user');
+	submit_button(__('Add User'), 'primary', 'add-user');
 	?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +15 added lines, -10 removed lines

@@ -10,8 +10,9 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users') ) {
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -30,11 +31,13 @@ 
 if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-user', '_wpnonce_add-user' );
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can( 'manage_network_users' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	}
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array( $_POST['user'] ) ) {
+			wp_die( __( 'Cannot create an empty user.' ) );
+	}
 
 	$user = wp_unslash( $_POST['user'] );
 
@@ -91,15 +94,17 @@ 
 <h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-}
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	}
 
 if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+			foreach ( $add_user_errors->get_error_messages() as $message ) {
+							echo "<p>$message</p>";
+			}
 		?>
 	</div>
 <?php } ?>

src/wp-admin/post.php

Indentation +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-     strpos( $sendback, 'post.php' ) !== false ||
-     strpos( $sendback, 'post-new.php' ) !== false ) {
+	 strpos( $sendback, 'post.php' ) !== false ||
+	 strpos( $sendback, 'post-new.php' ) !== false ) {
 	if ( 'attachment' == $post_type ) {
 		$sendback = admin_url( 'upload.php' );
 	} else {

Spacing +108 added lines, -108 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit.php';
 $submenu_file = 'edit.php';
 
-wp_reset_vars( array( 'action' ) );
+wp_reset_vars(array('action'));
 
-if ( isset( $_GET['post'] ) )
+if (isset($_GET['post']))
  	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
+elseif (isset($_POST['post_ID']))
  	$post_id = $post_ID = (int) $_POST['post_ID'];
 else
  	$post_id = $post_ID = 0;
@@ -30,59 +30,59 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
-	$post = get_post( $post_id );
+if ($post_id)
+	$post = get_post($post_id);
 
-if ( $post ) {
+if ($post) {
 	$post_type = $post->post_type;
-	$post_type_object = get_post_type_object( $post_type );
+	$post_type_object = get_post_type_object($post_type);
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if (isset($_POST['deletepost']))
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+elseif (isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'])
 	$action = 'preview';
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-     strpos( $sendback, 'post.php' ) !== false ||
-     strpos( $sendback, 'post-new.php' ) !== false ) {
-	if ( 'attachment' == $post_type ) {
-		$sendback = admin_url( 'upload.php' );
+     strpos($sendback, 'post.php') !== false ||
+     strpos($sendback, 'post-new.php') !== false) {
+	if ('attachment' == $post_type) {
+		$sendback = admin_url('upload.php');
 	} else {
-		$sendback = admin_url( 'edit.php' );
-		if ( ! empty( $post_type ) ) {
-			$sendback = add_query_arg( 'post_type', $post_type, $sendback );
+		$sendback = admin_url('edit.php');
+		if ( ! empty($post_type)) {
+			$sendback = add_query_arg('post_type', $post_type, $sendback);
 		}
 	}
 } else {
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+	$sendback = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'ids'), $sendback);
 }
 
-switch($action) {
+switch ($action) {
 case 'post-quickdraft-save':
 	// Check nonce and capabilities
 	$nonce = $_REQUEST['_wpnonce'];
 	$error_msg = false;
 
 	// For output of the quickdraft dashboard widget
-	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+	require_once ABSPATH.'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	if ( ! wp_verify_nonce($nonce, 'add-post'))
+		$error_msg = __('Unable to submit this form, please refresh and try again.');
 
-	if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+	if ( ! current_user_can(get_post_type_object('post')->cap->create_posts)) {
 		exit;
 	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
+	if ($error_msg)
+		return wp_dashboard_quick_press($error_msg);
 
-	$post = get_post( $_REQUEST['post_ID'] );
-	check_admin_referer( 'add-' . $post->post_type );
+	$post = get_post($_REQUEST['post_ID']);
+	check_admin_referer('add-'.$post->post_type);
 
-	$_POST['comment_status'] = get_default_comment_status( $post->post_type );
-	$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+	$_POST['comment_status'] = get_default_comment_status($post->post_type);
+	$_POST['ping_status']    = get_default_comment_status($post->post_type, 'pingback');
 
 	edit_post();
 	wp_dashboard_quick_press();
@@ -90,53 +90,53 @@ 
 
 case 'postajaxpost':
 case 'post':
-	check_admin_referer( 'add-' . $post_type );
+	check_admin_referer('add-'.$post_type);
 	$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
-	redirect_post( $post_id );
+	redirect_post($post_id);
 	exit();
 
 case 'edit':
 	$editing = true;
 
-	if ( empty( $post_id ) ) {
-		wp_redirect( admin_url('post.php') );
+	if (empty($post_id)) {
+		wp_redirect(admin_url('post.php'));
 		exit();
 	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $post)
+		wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+	if ( ! in_array($typenow, get_post_types(array('show_ui' => true)))) {
+		wp_die(__('Sorry, you are not allowed to edit posts in this post type.'));
 	}
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post_id))
+		wp_die(__('Sorry, you are not allowed to edit this item.'));
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	if ('trash' == $post->post_status)
+		wp_die(__('You can’t edit this item because it is in the Trash. Please restore it and try again.'));
 
-	if ( ! empty( $_GET['get-post-lock'] ) ) {
-		check_admin_referer( 'lock-post_' . $post_id );
-		wp_set_post_lock( $post_id );
-		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+	if ( ! empty($_GET['get-post-lock'])) {
+		check_admin_referer('lock-post_'.$post_id);
+		wp_set_post_lock($post_id);
+		wp_redirect(get_edit_post_link($post_id, 'url'));
 		exit();
 	}
 
 	$post_type = $post->post_type;
-	if ( 'post' == $post_type ) {
+	if ('post' == $post_type) {
 		$parent_file = "edit.php";
 		$submenu_file = "edit.php";
 		$post_new_file = "post-new.php";
-	} elseif ( 'attachment' == $post_type ) {
+	} elseif ('attachment' == $post_type) {
 		$parent_file = 'upload.php';
 		$submenu_file = 'upload.php';
 		$post_new_file = 'media-new.php';
 	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+		if (isset($post_type_object) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true)
 			$parent_file = $post_type_object->show_in_menu;
 		else
 			$parent_file = "edit.php?post_type=$post_type";
@@ -144,57 +144,57 @@ 
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
 
-	if ( ! wp_check_post_lock( $post->ID ) ) {
-		$active_post_lock = wp_set_post_lock( $post->ID );
+	if ( ! wp_check_post_lock($post->ID)) {
+		$active_post_lock = wp_set_post_lock($post->ID);
 
-		if ( 'attachment' !== $post_type )
+		if ('attachment' !== $post_type)
 			wp_enqueue_script('autosave');
 	}
 
-	if ( is_multisite() ) {
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (is_multisite()) {
+		add_action('admin_footer', '_admin_notice_post_locked');
 	} else {
-		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+		$check_users = get_users(array('fields' => 'ID', 'number' => 2));
 
-		if ( count( $check_users ) > 1 )
-			add_action( 'admin_footer', '_admin_notice_post_locked' );
+		if (count($check_users) > 1)
+			add_action('admin_footer', '_admin_notice_post_locked');
 
-		unset( $check_users );
+		unset($check_users);
 	}
 
 	$title = $post_type_object->labels->edit_item;
 	$post = get_post($post_id, OBJECT, 'edit');
 
-	if ( post_type_supports($post_type, 'comments') ) {
+	if (post_type_supports($post_type, 'comments')) {
 		wp_enqueue_script('admin-comments');
 		enqueue_comment_hotkeys_js();
 	}
 
-	include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+	include(ABSPATH.'wp-admin/edit-form-advanced.php');
 
 	break;
 
 case 'editattachment':
-	check_admin_referer('update-post_' . $post_id);
+	check_admin_referer('update-post_'.$post_id);
 
 	// Don't let these be changed
 	unset($_POST['guid']);
 	$_POST['post_type'] = 'attachment';
 
 	// Update the thumbnail filename
-	$newmeta = wp_get_attachment_metadata( $post_id, true );
+	$newmeta = wp_get_attachment_metadata($post_id, true);
 	$newmeta['thumb'] = $_POST['thumb'];
 
-	wp_update_attachment_metadata( $post_id, $newmeta );
+	wp_update_attachment_metadata($post_id, $newmeta);
 
 case 'editpost':
-	check_admin_referer('update-post_' . $post_id);
+	check_admin_referer('update-post_'.$post_id);
 
 	$post_id = edit_post();
 
 	// Session cookie flag that the post was saved
-	if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-		setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
+	if (isset($_COOKIE['wp-saving-post']) && $_COOKIE['wp-saving-post'] === $post_id.'-check') {
+		setcookie('wp-saving-post', $post_id.'-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl());
 	}
 
 	redirect_post($post_id); // Send user on their way while we keep working
@@ -202,72 +202,72 @@ 
 	exit();
 
 case 'trash':
-	check_admin_referer('trash-post_' . $post_id);
+	check_admin_referer('trash-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	if ( ! $post)
+		wp_die(__('The item you are trying to move to the Trash no longer exists.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('Sorry, you are not allowed to move this item to the Trash.'));
 
-	if ( $user_id = wp_check_post_lock( $post_id ) ) {
-		$user = get_userdata( $user_id );
-		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+	if ($user_id = wp_check_post_lock($post_id)) {
+		$user = get_userdata($user_id);
+		wp_die(sprintf(__('You cannot move this item to the Trash. %s is currently editing.'), $user->display_name));
 	}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+	if ( ! wp_trash_post($post_id))
+		wp_die(__('Error in moving to Trash.'));
 
-	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
+	wp_redirect(add_query_arg(array('trashed' => 1, 'ids' => $post_id), $sendback));
 	exit();
 
 case 'untrash':
-	check_admin_referer('untrash-post_' . $post_id);
+	check_admin_referer('untrash-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	if ( ! $post)
+		wp_die(__('The item you are trying to restore from the Trash no longer exists.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('Sorry, you are not allowed to restore this item from the Trash.'));
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+	if ( ! wp_untrash_post($post_id))
+		wp_die(__('Error in restoring from Trash.'));
 
-	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+	wp_redirect(add_query_arg('untrashed', 1, $sendback));
 	exit();
 
 case 'delete':
-	check_admin_referer('delete-post_' . $post_id);
+	check_admin_referer('delete-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+	if ( ! $post)
+		wp_die(__('This item has already been deleted.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('Sorry, you are not allowed to delete this item.'));
 
-	if ( $post->post_type == 'attachment' ) {
-		$force = ( ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+	if ($post->post_type == 'attachment') {
+		$force = ( ! MEDIA_TRASH);
+		if ( ! wp_delete_attachment($post_id, $force))
+			wp_die(__('Error in deleting.'));
 	} else {
-		if ( ! wp_delete_post( $post_id, true ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_post($post_id, true))
+			wp_die(__('Error in deleting.'));
 	}
 
-	wp_redirect( add_query_arg('deleted', 1, $sendback) );
+	wp_redirect(add_query_arg('deleted', 1, $sendback));
 	exit();
 
 case 'preview':
-	check_admin_referer( 'update-post_' . $post_id );
+	check_admin_referer('update-post_'.$post_id);
 
 	$url = post_preview();
 
@@ -284,9 +284,9 @@ 
 	 *
 	 * @param int $post_id Post ID sent with the request.
 	 */
-	do_action( "post_action_{$action}", $post_id );
+	do_action("post_action_{$action}", $post_id);
 
-	wp_redirect( admin_url('edit.php') );
+	wp_redirect(admin_url('edit.php'));
 	exit();
 } // end switch
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +77 added lines, -52 removed lines

@@ -16,12 +16,13 @@ 
 
 wp_reset_vars( array( 'action' ) );
 
-if ( isset( $_GET['post'] ) )
+if ( isset( $_GET['post'] ) ) {
  	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
+} elseif ( isset( $_POST['post_ID'] ) ) {
  	$post_id = $post_ID = (int) $_POST['post_ID'];
-else
+} else {
  	$post_id = $post_ID = 0;
+}
 
 /**
  * @global string  $post_type
@@ -30,18 +31,20 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
+if ( $post_id ) {
 	$post = get_post( $post_id );
+}
 
 if ( $post ) {
 	$post_type = $post->post_type;
 	$post_type_object = get_post_type_object( $post_type );
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if ( isset( $_POST['deletepost'] ) ) {
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+} elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] ) {
 	$action = 'preview';
+}
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
@@ -68,15 +71,17 @@ 
 	// For output of the quickdraft dashboard widget
 	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
+			$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	}
 
 	if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
 		exit;
 	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
+	if ( $error_msg ) {
+			return wp_dashboard_quick_press( $error_msg );
+	}
 
 	$post = get_post( $_REQUEST['post_ID'] );
 	check_admin_referer( 'add-' . $post->post_type );
@@ -103,21 +108,25 @@ 
 		exit();
 	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $post ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
 	if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
 		wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
 	}
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	}
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	if ( 'trash' == $post->post_status ) {
+			wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	}
 
 	if ( ! empty( $_GET['get-post-lock'] ) ) {
 		check_admin_referer( 'lock-post_' . $post_id );
@@ -136,10 +145,11 @@ 
 		$submenu_file = 'upload.php';
 		$post_new_file = 'media-new.php';
 	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
-			$parent_file = $post_type_object->show_in_menu;
-		else
-			$parent_file = "edit.php?post_type=$post_type";
+		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+					$parent_file = $post_type_object->show_in_menu;
+		} else {
+					$parent_file = "edit.php?post_type=$post_type";
+		}
 		$submenu_file = "edit.php?post_type=$post_type";
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
@@ -147,8 +157,9 @@ 
 	if ( ! wp_check_post_lock( $post->ID ) ) {
 		$active_post_lock = wp_set_post_lock( $post->ID );
 
-		if ( 'attachment' !== $post_type )
-			wp_enqueue_script('autosave');
+		if ( 'attachment' !== $post_type ) {
+					wp_enqueue_script('autosave');
+		}
 	}
 
 	if ( is_multisite() ) {
@@ -156,8 +167,9 @@ 
 	} else {
 		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-		if ( count( $check_users ) > 1 )
-			add_action( 'admin_footer', '_admin_notice_post_locked' );
+		if ( count( $check_users ) > 1 ) {
+					add_action( 'admin_footer', '_admin_notice_post_locked' );
+		}
 
 		unset( $check_users );
 	}
@@ -204,22 +216,26 @@ 
 case 'trash':
 	check_admin_referer('trash-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+	}
 
 	if ( $user_id = wp_check_post_lock( $post_id ) ) {
 		$user = get_userdata( $user_id );
 		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
 	}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+	if ( ! wp_trash_post( $post_id ) ) {
+			wp_die( __( 'Error in moving to Trash.' ) );
+	}
 
 	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
 	exit();
@@ -227,17 +243,21 @@ 
 case 'untrash':
 	check_admin_referer('untrash-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+	}
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+	if ( ! wp_untrash_post( $post_id ) ) {
+			wp_die( __( 'Error in restoring from Trash.' ) );
+	}
 
 	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
 	exit();
@@ -245,22 +265,27 @@ 
 case 'delete':
 	check_admin_referer('delete-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'This item has already been deleted.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+	}
 
 	if ( $post->post_type == 'attachment' ) {
 		$force = ( ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_attachment( $post_id, $force ) ) {
+					wp_die( __( 'Error in deleting.' ) );
+		}
 	} else {
-		if ( ! wp_delete_post( $post_id, true ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_post( $post_id, true ) ) {
+					wp_die( __( 'Error in deleting.' ) );
+		}
 	}
 
 	wp_redirect( add_query_arg('deleted', 1, $sendback) );

src/wp-admin/revision.php

Braces +28 added lines, -18 removed lines

@@ -25,20 +25,24 @@ 
 $revision_id = absint( $revision );
 
 $from = is_numeric( $from ) ? absint( $from ) : null;
-if ( ! $revision_id )
+if ( ! $revision_id ) {
 	$revision_id = absint( $to );
+}
 $redirect = 'edit.php';
 
 switch ( $action ) {
 case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
+	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+			break;
+	}
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+	if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) {
+			break;
+	}
 
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+	if ( ! $post = get_post( $revision->post_parent ) ) {
+			break;
+	}
 
 	// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
 	if ( ! wp_revisions_enabled( $post ) ) {
@@ -47,8 +51,9 @@ 
 	}
 
 	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
+	if ( wp_check_post_lock( $post->ID ) ) {
+			break;
+	}
 
 	check_admin_referer( "restore-post_{$revision->ID}" );
 
@@ -58,13 +63,16 @@ 
 case 'view' :
 case 'edit' :
 default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+			break;
+	}
+	if ( ! $post = get_post( $revision->post_parent ) ) {
+			break;
+	}
 
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) ) {
+			break;
+	}
 
 	// Revisions disabled and we're not looking at an autosave
 	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
@@ -83,8 +91,9 @@ 
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) )
+if ( ! $redirect && empty( $post->post_type ) ) {
 	$redirect = 'edit.php';
+}
 
 if ( ! empty( $redirect ) ) {
 	wp_redirect( $redirect );
@@ -92,10 +101,11 @@ 
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
+if ( ! empty( $post->post_type ) && 'post' != $post->post_type ) {
 	$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
-else
+} else {
 	$parent_file = $submenu_file = 'edit.php';
+}
 
 wp_enqueue_script( 'revisions' );
 wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );

Switch Indentation +43 added lines, -43 removed lines

@@ -30,57 +30,57 @@
 $redirect = 'edit.php';
 
 switch ( $action ) {
-case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
+	case 'restore' :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+			break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
 
-	// Restore if revisions are enabled or this is an autosave.
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
+		// Restore if revisions are enabled or this is an autosave.
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
 
-	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
+		// Don't allow revision restore when post is locked
+		if ( wp_check_post_lock( $post->ID ) )
+			break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+		check_admin_referer( "restore-post_{$revision->ID}" );
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-	break;
-case 'view' :
-case 'edit' :
-default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+		wp_restore_post_revision( $revision->ID );
+		$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	case 'view' :
+	case 'edit' :
+	default :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
+
+		if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
+			break;
+
+		// Revisions disabled and we're not looking at an autosave
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
+
+		$post_edit_link = get_edit_post_link();
+		$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+		/* translators: 1: Post title */
+		$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+		$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
+		$title          = __( 'Revisions' );
+
+		$redirect = false;
 		break;
-
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
-
-	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
-
-	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	/* translators: 1: Post title */
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
-	$title          = __( 'Revisions' );
-
-	$redirect = false;
-	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.

Spacing +48 added lines, -48 removed lines

@@ -16,113 +16,113 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require ABSPATH . 'wp-admin/includes/revision.php';
+require ABSPATH.'wp-admin/includes/revision.php';
 
-wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) );
+wp_reset_vars(array('revision', 'action', 'from', 'to'));
 
-$revision_id = absint( $revision );
+$revision_id = absint($revision);
 
-$from = is_numeric( $from ) ? absint( $from ) : null;
-if ( ! $revision_id )
-	$revision_id = absint( $to );
+$from = is_numeric($from) ? absint($from) : null;
+if ( ! $revision_id)
+	$revision_id = absint($to);
 $redirect = 'edit.php';
 
-switch ( $action ) {
+switch ($action) {
 case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	if ( ! $revision = wp_get_post_revision($revision_id))
 		break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+	if ( ! current_user_can('edit_post', $revision->post_parent))
 		break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
+	if ( ! $post = get_post($revision->post_parent))
 		break;
 
 	// Restore if revisions are enabled or this is an autosave.
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
+	if ( ! wp_revisions_enabled($post) && ! wp_is_post_autosave($revision)) {
+		$redirect = 'edit.php?post_type='.$post->post_type;
 		break;
 	}
 
 	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
+	if (wp_check_post_lock($post->ID))
 		break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+	check_admin_referer("restore-post_{$revision->ID}");
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
+	wp_restore_post_revision($revision->ID);
+	$redirect = add_query_arg(array('message' => 5, 'revision' => $revision->ID), get_edit_post_link($post->ID, 'url'));
 	break;
 case 'view' :
 case 'edit' :
 default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	if ( ! $revision = wp_get_post_revision($revision_id))
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	if ( ! $post = get_post($revision->post_parent))
 		break;
 
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
+	if ( ! current_user_can('read_post', $revision->ID) || ! current_user_can('edit_post', $revision->post_parent))
 		break;
 
 	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
+	if ( ! wp_revisions_enabled($post) && ! wp_is_post_autosave($revision)) {
+		$redirect = 'edit.php?post_type='.$post->post_type;
 		break;
 	}
 
 	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+	$post_title     = '<a href="'.$post_edit_link.'">'._draft_or_post_title().'</a>';
 	/* translators: 1: Post title */
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
-	$title          = __( 'Revisions' );
+	$h1             = sprintf(__('Compare Revisions of &#8220;%1$s&#8221;'), $post_title);
+	$return_to_post = '<a href="'.$post_edit_link.'">'.__('&larr; Return to editor').'</a>';
+	$title          = __('Revisions');
 
 	$redirect = false;
 	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) )
+if ( ! $redirect && empty($post->post_type))
 	$redirect = 'edit.php';
 
-if ( ! empty( $redirect ) ) {
-	wp_redirect( $redirect );
+if ( ! empty($redirect)) {
+	wp_redirect($redirect);
 	exit;
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
-	$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
+if ( ! empty($post->post_type) && 'post' != $post->post_type)
+	$parent_file = $submenu_file = 'edit.php?post_type='.$post->post_type;
 else
 	$parent_file = $submenu_file = 'edit.php';
 
-wp_enqueue_script( 'revisions' );
-wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
+wp_enqueue_script('revisions');
+wp_localize_script('revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js($post, $revision_id, $from));
 
 /* Revisions Help Tab */
 
-$revisions_overview  = '<p>' . __( 'This screen is used for managing your content revisions.' ) . '</p>';
-$revisions_overview .= '<p>' . __( 'Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.' ) . '</p>';
-$revisions_overview .= '<p>' . __( 'From this screen you can review, compare, and restore revisions:' ) . '</p>';
-$revisions_overview .= '<ul><li>' . __( 'To navigate between revisions, <strong>drag the slider handle left or right</strong> or <strong>use the Previous or Next buttons</strong>.' ) . '</li>';
-$revisions_overview .= '<li>' . __( 'Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.' ) . '</li>';
-$revisions_overview .= '<li>' . __( 'To restore a revision, <strong>click Restore This Revision</strong>.' ) . '</li></ul>';
+$revisions_overview  = '<p>'.__('This screen is used for managing your content revisions.').'</p>';
+$revisions_overview .= '<p>'.__('Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.').'</p>';
+$revisions_overview .= '<p>'.__('From this screen you can review, compare, and restore revisions:').'</p>';
+$revisions_overview .= '<ul><li>'.__('To navigate between revisions, <strong>drag the slider handle left or right</strong> or <strong>use the Previous or Next buttons</strong>.').'</li>';
+$revisions_overview .= '<li>'.__('Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.').'</li>';
+$revisions_overview .= '<li>'.__('To restore a revision, <strong>click Restore This Revision</strong>.').'</li></ul>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'revisions-overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $revisions_overview
-) );
+));
 
-$revisions_sidebar  = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://codex.wordpress.org/Revision_Management">Revisions Management</a>' ) . '</p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>';
+$revisions_sidebar  = '<p><strong>'.__('For more information:').'</strong></p>';
+$revisions_sidebar .= '<p>'.__('<a href="https://codex.wordpress.org/Revision_Management">Revisions Management</a>').'</p>';
+$revisions_sidebar .= '<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>';
 
-get_current_screen()->set_help_sidebar( $revisions_sidebar );
+get_current_screen()->set_help_sidebar($revisions_sidebar);
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
@@ -133,4 +133,4 @@ 
 <?php
 wp_print_revision_templates();
 
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/edit-form-advanced.php

Indentation +1 added lines, -1 removed lines

@@ -575,7 +575,7 @@
 	$shortlink = wp_get_shortlink($post->ID, 'post');
 
 	if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) {
-    	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+		$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
 	}
 }
 

Spacing +242 added lines, -242 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 
 /**
@@ -29,17 +29,17 @@ 
  * @param bool   $expand    Whether to enable the 'expand' functionality. Default true.
  * @param string $post_type Post type.
  */
-if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
-	 ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
-	 apply_filters( 'wp_editor_expand', true, $post_type ) ) {
+if (post_type_supports($post_type, 'editor') && ! wp_is_mobile() &&
+	 ! ($is_IE && preg_match('/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'])) &&
+	 apply_filters('wp_editor_expand', true, $post_type)) {
 
 	wp_enqueue_script('editor-expand');
 	$_content_editor_dfw = true;
-	$_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
+	$_wp_editor_expand = (get_user_setting('editor_expand', 'on') === 'on');
 }
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 /**
  * Post ID global
@@ -50,33 +50,33 @@ 
 $user_ID = isset($user_ID) ? (int) $user_ID : 0;
 $action = isset($action) ? $action : '';
 
-if ( $post_ID == get_option( 'page_for_posts' ) && empty( $post->post_content ) ) {
-	add_action( 'edit_form_after_title', '_wp_posts_page_notice' );
-	remove_post_type_support( $post_type, 'editor' );
+if ($post_ID == get_option('page_for_posts') && empty($post->post_content)) {
+	add_action('edit_form_after_title', '_wp_posts_page_notice');
+	remove_post_type_support($post_type, 'editor');
 }
 
-$thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' );
-if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type ) {
-	if ( wp_attachment_is( 'audio', $post ) ) {
-		$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-	} elseif ( wp_attachment_is( 'video', $post ) ) {
-		$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+$thumbnail_support = current_theme_supports('post-thumbnails', $post_type) && post_type_supports($post_type, 'thumbnail');
+if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type) {
+	if (wp_attachment_is('audio', $post)) {
+		$thumbnail_support = post_type_supports('attachment:audio', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:audio');
+	} elseif (wp_attachment_is('video', $post)) {
+		$thumbnail_support = post_type_supports('attachment:video', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:video');
 	}
 }
 
-if ( $thumbnail_support ) {
+if ($thumbnail_support) {
 	add_thickbox();
-	wp_enqueue_media( array( 'post' => $post_ID ) );
+	wp_enqueue_media(array('post' => $post_ID));
 }
 
 // Add the local autosave notice HTML
-add_action( 'admin_footer', '_local_storage_notice' );
+add_action('admin_footer', '_local_storage_notice');
 
 /*
  * @todo Document the $messages array(s).
  */
-$permalink = get_permalink( $post_ID );
-if ( ! $permalink ) {
+$permalink = get_permalink($post_ID);
+if ( ! $permalink) {
 	$permalink = '';
 }
 
@@ -85,82 +85,82 @@ 
 $preview_post_link_html = $scheduled_post_link_html = $view_post_link_html = '';
 $preview_page_link_html = $scheduled_page_link_html = $view_page_link_html = '';
 
-$preview_url = get_preview_post_link( $post );
+$preview_url = get_preview_post_link($post);
 
-$viewable = is_post_type_viewable( $post_type_object );
+$viewable = is_post_type_viewable($post_type_object);
 
-if ( $viewable ) {
+if ($viewable) {
 
 	// Preview post link.
-	$preview_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-		esc_url( $preview_url ),
-		__( 'Preview post' )
+	$preview_post_link_html = sprintf(' <a target="_blank" href="%1$s">%2$s</a>',
+		esc_url($preview_url),
+		__('Preview post')
 	);
 
 	// Scheduled post preview link.
-	$scheduled_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-		esc_url( $permalink ),
-		__( 'Preview post' )
+	$scheduled_post_link_html = sprintf(' <a target="_blank" href="%1$s">%2$s</a>',
+		esc_url($permalink),
+		__('Preview post')
 	);
 
 	// View post link.
-	$view_post_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
-		esc_url( $permalink ),
-		__( 'View post' )
+	$view_post_link_html = sprintf(' <a href="%1$s">%2$s</a>',
+		esc_url($permalink),
+		__('View post')
 	);
 
 	// Preview page link.
-	$preview_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-		esc_url( $preview_url ),
-		__( 'Preview page' )
+	$preview_page_link_html = sprintf(' <a target="_blank" href="%1$s">%2$s</a>',
+		esc_url($preview_url),
+		__('Preview page')
 	);
 
 	// Scheduled page preview link.
-	$scheduled_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-		esc_url( $permalink ),
-		__( 'Preview page' )
+	$scheduled_page_link_html = sprintf(' <a target="_blank" href="%1$s">%2$s</a>',
+		esc_url($permalink),
+		__('Preview page')
 	);
 
 	// View page link.
-	$view_page_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
-		esc_url( $permalink ),
-		__( 'View page' )
+	$view_page_link_html = sprintf(' <a href="%1$s">%2$s</a>',
+		esc_url($permalink),
+		__('View page')
 	);
 
 }
 
 /* translators: Publish box date format, see https://secure.php.net/date */
-$scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
+$scheduled_date = date_i18n(__('M j, Y @ H:i'), strtotime($post->post_date));
 
 $messages['post'] = array(
 	 0 => '', // Unused. Messages start at index 1.
-	 1 => __( 'Post updated.' ) . $view_post_link_html,
-	 2 => __( 'Custom field updated.' ),
-	 3 => __( 'Custom field deleted.' ),
-	 4 => __( 'Post updated.' ),
+	 1 => __('Post updated.').$view_post_link_html,
+	 2 => __('Custom field updated.'),
+	 3 => __('Custom field deleted.'),
+	 4 => __('Post updated.'),
 	/* translators: %s: date and time of the revision */
-	 5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-	 6 => __( 'Post published.' ) . $view_post_link_html,
-	 7 => __( 'Post saved.' ),
-	 8 => __( 'Post submitted.' ) . $preview_post_link_html,
-	 9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
-	10 => __( 'Post draft updated.' ) . $preview_post_link_html,
+	 5 => isset($_GET['revision']) ? sprintf(__('Post restored to revision from %s.'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+	 6 => __('Post published.').$view_post_link_html,
+	 7 => __('Post saved.'),
+	 8 => __('Post submitted.').$preview_post_link_html,
+	 9 => sprintf(__('Post scheduled for: %s.'), '<strong>'.$scheduled_date.'</strong>').$scheduled_post_link_html,
+	10 => __('Post draft updated.').$preview_post_link_html,
 );
 $messages['page'] = array(
 	 0 => '', // Unused. Messages start at index 1.
-	 1 => __( 'Page updated.' ) . $view_page_link_html,
-	 2 => __( 'Custom field updated.' ),
-	 3 => __( 'Custom field deleted.' ),
-	 4 => __( 'Page updated.' ),
+	 1 => __('Page updated.').$view_page_link_html,
+	 2 => __('Custom field updated.'),
+	 3 => __('Custom field deleted.'),
+	 4 => __('Page updated.'),
 	/* translators: %s: date and time of the revision */
-	 5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-	 6 => __( 'Page published.' ) . $view_page_link_html,
-	 7 => __( 'Page saved.' ),
-	 8 => __( 'Page submitted.' ) . $preview_page_link_html,
-	 9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
-	10 => __( 'Page draft updated.' ) . $preview_page_link_html,
+	 5 => isset($_GET['revision']) ? sprintf(__('Page restored to revision from %s.'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+	 6 => __('Page published.').$view_page_link_html,
+	 7 => __('Page saved.'),
+	 8 => __('Page submitted.').$preview_page_link_html,
+	 9 => sprintf(__('Page scheduled for: %s.'), '<strong>'.$scheduled_date.'</strong>').$scheduled_page_link_html,
+	10 => __('Page draft updated.').$preview_page_link_html,
 );
-$messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now.
+$messages['attachment'] = array_fill(1, 10, __('Media file updated.')); // Hack, for now.
 
 /**
  * Filters the post updated messages.
@@ -169,110 +169,110 @@ 
  *
  * @param array $messages Post updated messages. For defaults @see $messages declarations above.
  */
-$messages = apply_filters( 'post_updated_messages', $messages );
+$messages = apply_filters('post_updated_messages', $messages);
 
 $message = false;
-if ( isset($_GET['message']) ) {
-	$_GET['message'] = absint( $_GET['message'] );
-	if ( isset($messages[$post_type][$_GET['message']]) )
+if (isset($_GET['message'])) {
+	$_GET['message'] = absint($_GET['message']);
+	if (isset($messages[$post_type][$_GET['message']]))
 		$message = $messages[$post_type][$_GET['message']];
-	elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
+	elseif ( ! isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]))
 		$message = $messages['post'][$_GET['message']];
 }
 
 $notice = false;
 $form_extra = '';
-if ( 'auto-draft' == $post->post_status ) {
-	if ( 'edit' == $action )
+if ('auto-draft' == $post->post_status) {
+	if ('edit' == $action)
 		$post->post_title = '';
 	$autosave = false;
 	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
-	$autosave = wp_get_post_autosave( $post_ID );
+	$autosave = wp_get_post_autosave($post_ID);
 }
 
 $form_action = 'editpost';
-$nonce_action = 'update-post_' . $post_ID;
-$form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
+$nonce_action = 'update-post_'.$post_ID;
+$form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='".esc_attr($post_ID)."' />";
 
 // Detect if there exists an autosave newer than the post and if that autosave is different than the post
-if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
-	foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) {
-		if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
-			$notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
+if ($autosave && mysql2date('U', $autosave->post_modified_gmt, false) > mysql2date('U', $post->post_modified_gmt, false)) {
+	foreach (_wp_post_revision_fields($post) as $autosave_field => $_autosave_field) {
+		if (normalize_whitespace($autosave->$autosave_field) != normalize_whitespace($post->$autosave_field)) {
+			$notice = sprintf(__('There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>'), get_edit_post_link($autosave->ID));
 			break;
 		}
 	}
 	// If this autosave isn't different from the current post, begone.
-	if ( ! $notice )
-		wp_delete_post_revision( $autosave->ID );
+	if ( ! $notice)
+		wp_delete_post_revision($autosave->ID);
 	unset($autosave_field, $_autosave_field);
 }
 
 $post_type_object = get_post_type_object($post_type);
 
 // All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
-require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' );
+require_once(ABSPATH.'wp-admin/includes/meta-boxes.php');
 
 
 $publish_callback_args = null;
-if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) {
-	$revisions = wp_get_post_revisions( $post_ID );
+if (post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status) {
+	$revisions = wp_get_post_revisions($post_ID);
 
 	// We should aim to show the revisions meta box only when there are revisions.
-	if ( count( $revisions ) > 1 ) {
-		reset( $revisions ); // Reset pointer for key()
-		$publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) );
+	if (count($revisions) > 1) {
+		reset($revisions); // Reset pointer for key()
+		$publish_callback_args = array('revisions_count' => count($revisions), 'revision_id' => key($revisions));
 		add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
 	}
 }
 
-if ( 'attachment' == $post_type ) {
-	wp_enqueue_script( 'image-edit' );
-	wp_enqueue_style( 'imgareaselect' );
-	add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' );
-	add_action( 'edit_form_after_title', 'edit_form_image_editor' );
+if ('attachment' == $post_type) {
+	wp_enqueue_script('image-edit');
+	wp_enqueue_style('imgareaselect');
+	add_meta_box('submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core');
+	add_action('edit_form_after_title', 'edit_form_image_editor');
 
-	if ( wp_attachment_is( 'audio', $post ) ) {
-		add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core' );
+	if (wp_attachment_is('audio', $post)) {
+		add_meta_box('attachment-id3', __('Metadata'), 'attachment_id3_data_meta_box', null, 'normal', 'core');
 	}
 } else {
-	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core', $publish_callback_args );
+	add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', null, 'side', 'core', $publish_callback_args);
 }
 
-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
-	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
+if (current_theme_supports('post-formats') && post_type_supports($post_type, 'post-formats'))
+	add_meta_box('formatdiv', _x('Format', 'post format'), 'post_format_meta_box', null, 'side', 'core');
 
 // all taxonomies
-foreach ( get_object_taxonomies( $post ) as $tax_name ) {
-	$taxonomy = get_taxonomy( $tax_name );
-	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb )
+foreach (get_object_taxonomies($post) as $tax_name) {
+	$taxonomy = get_taxonomy($tax_name);
+	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb)
 		continue;
 
 	$label = $taxonomy->labels->name;
 
-	if ( ! is_taxonomy_hierarchical( $tax_name ) )
-		$tax_meta_box_id = 'tagsdiv-' . $tax_name;
+	if ( ! is_taxonomy_hierarchical($tax_name))
+		$tax_meta_box_id = 'tagsdiv-'.$tax_name;
 	else
-		$tax_meta_box_id = $tax_name . 'div';
+		$tax_meta_box_id = $tax_name.'div';
 
-	add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
+	add_meta_box($tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array('taxonomy' => $tax_name));
 }
 
-if ( post_type_supports( $post_type, 'page-attributes' ) || count( get_page_templates( $post ) ) > 0 ) {
-	add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core' );
+if (post_type_supports($post_type, 'page-attributes') || count(get_page_templates($post)) > 0) {
+	add_meta_box('pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core');
 }
 
-if ( $thumbnail_support && current_user_can( 'upload_files' ) )
-	add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low');
+if ($thumbnail_support && current_user_can('upload_files'))
+	add_meta_box('postimagediv', esc_html($post_type_object->labels->featured_image), 'post_thumbnail_meta_box', null, 'side', 'low');
 
-if ( post_type_supports($post_type, 'excerpt') )
+if (post_type_supports($post_type, 'excerpt'))
 	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
 
-if ( post_type_supports($post_type, 'trackbacks') )
+if (post_type_supports($post_type, 'trackbacks'))
 	add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
 
-if ( post_type_supports($post_type, 'custom-fields') )
+if (post_type_supports($post_type, 'custom-fields'))
 	add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
 
 /**
@@ -283,33 +283,33 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'dbx_post_advanced', $post );
+do_action('dbx_post_advanced', $post);
 
 // Allow the Discussion meta box to show up if the post type supports comments,
 // or if comments or pings are open.
-if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) {
-	add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core' );
+if (comments_open($post) || pings_open($post) || post_type_supports($post_type, 'comments')) {
+	add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
 }
 
-$stati = get_post_stati( array( 'public' => true ) );
-if ( empty( $stati ) ) {
-	$stati = array( 'publish' );
+$stati = get_post_stati(array('public' => true));
+if (empty($stati)) {
+	$stati = array('publish');
 }
 $stati[] = 'private';
 
-if ( in_array( get_post_status( $post ), $stati ) ) {
+if (in_array(get_post_status($post), $stati)) {
 	// If the post type support comments, or the post has comments, allow the
 	// Comments meta box.
-	if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
-		add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core' );
+	if (comments_open($post) || pings_open($post) || $post->comment_count > 0 || post_type_supports($post_type, 'comments')) {
+		add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
 	}
 }
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
+if ( ! ('pending' == get_post_status($post) && ! current_user_can($post_type_object->cap->publish_posts)))
 	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
 
-if ( post_type_supports( $post_type, 'author' ) && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
-	add_meta_box( 'authordiv', __( 'Author' ), 'post_author_meta_box', null, 'normal', 'core' );
+if (post_type_supports($post_type, 'author') && current_user_can($post_type_object->cap->edit_others_posts)) {
+	add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
 }
 
 /**
@@ -320,7 +320,7 @@ 
  * @param string  $post_type Post type.
  * @param WP_Post $post      Post object.
  */
-do_action( 'add_meta_boxes', $post_type, $post );
+do_action('add_meta_boxes', $post_type, $post);
 
 /**
  * Fires after all built-in meta boxes have been added, contextually for the given post type.
@@ -331,7 +331,7 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( "add_meta_boxes_{$post_type}", $post );
+do_action("add_meta_boxes_{$post_type}", $post);
 
 /**
  * Fires after meta boxes have been added.
@@ -344,156 +344,156 @@ 
  * @param string  $context   string  Meta box context.
  * @param WP_Post $post      Post object.
  */
-do_action( 'do_meta_boxes', $post_type, 'normal', $post );
+do_action('do_meta_boxes', $post_type, 'normal', $post);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', $post_type, 'advanced', $post );
+do_action('do_meta_boxes', $post_type, 'advanced', $post);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', $post_type, 'side', $post );
+do_action('do_meta_boxes', $post_type, 'side', $post);
 
-add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
+add_screen_option('layout_columns', array('max' => 2, 'default' => 2));
 
-if ( 'post' == $post_type ) {
-	$customize_display = '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.') . '</p>';
+if ('post' == $post_type) {
+	$customize_display = '<p>'.__('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'customize-display',
 		'title'   => __('Customizing This Display'),
 		'content' => $customize_display,
-	) );
+	));
 
-	$title_and_editor  = '<p>' . __('<strong>Title</strong> &mdash; Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>';
-	$title_and_editor .= '<p>' . __( '<strong>Post editor</strong> &mdash; Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.' ) . '</p>';
-	$title_and_editor .= '<p>' . __( 'Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.' ) . '</p>';
-	$title_and_editor .= '<p>' . __( 'The Text mode allows you to enter HTML along with your post text. Note that &lt;p&gt; and &lt;br&gt; tags are converted to line breaks when switching to the Text editor to make it less cluttered. When you type, a single line break can be used instead of typing &lt;br&gt;, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.' ) . '</p>';
-	$title_and_editor .= '<p>' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
-	$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
-	$title_and_editor .= '<p>' . __( 'Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.' ) . '</p>';
+	$title_and_editor  = '<p>'.__('<strong>Title</strong> &mdash; Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.').'</p>';
+	$title_and_editor .= '<p>'.__('<strong>Post editor</strong> &mdash; Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.').'</p>';
+	$title_and_editor .= '<p>'.__('Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.').'</p>';
+	$title_and_editor .= '<p>'.__('The Text mode allows you to enter HTML along with your post text. Note that &lt;p&gt; and &lt;br&gt; tags are converted to line breaks when switching to the Text editor to make it less cluttered. When you type, a single line break can be used instead of typing &lt;br&gt;, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.').'</p>';
+	$title_and_editor .= '<p>'.__('You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.').'</p>';
+	$title_and_editor .= '<p>'.__('You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.').'</p>';
+	$title_and_editor .= '<p>'.__('Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'title-post-editor',
 		'title'   => __('Title and Post Editor'),
 		'content' => $title_and_editor,
-	) );
+	));
 
 	get_current_screen()->set_help_sidebar(
-			'<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'tools.php') . '</p>' .
-			'<p><strong>' . __('For more information:') . '</strong></p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Posts_Add_New_Screen">Documentation on Writing and Editing Posts</a>') . '</p>' .
-			'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+			'<p>'.sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'tools.php').'</p>'.
+			'<p><strong>'.__('For more information:').'</strong></p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Posts_Add_New_Screen">Documentation on Writing and Editing Posts</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
-} elseif ( 'page' == $post_type ) {
-	$about_pages = '<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>' .
-		'<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.') . '</p>';
+} elseif ('page' == $post_type) {
+	$about_pages = '<p>'.__('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.').'</p>'.
+		'<p>'.__('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'about-pages',
 		'title'   => __('About Pages'),
 		'content' => $about_pages,
-	) );
+	));
 
 	get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __('For more information:') . '</strong></p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Pages_Add_New_Screen">Documentation on Adding New Pages</a>') . '</p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages">Documentation on Editing Pages</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/Pages_Add_New_Screen">Documentation on Adding New Pages</a>').'</p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages">Documentation on Editing Pages</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
-} elseif ( 'attachment' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+} elseif ('attachment' == $post_type) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __('This screen allows you to edit four fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
+			'<p>'.__('This screen allows you to edit four fields for metadata in a file within the media library.').'</p>'.
+			'<p>'.__('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.').'</p>'.
+			'<p>'.__('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.').'</p>'.
+			'<p>'.__('Remember to click Update Media to save metadata entered or changed.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</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/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
 }
 
-if ( 'post' == $post_type || 'page' == $post_type ) {
-	$inserting_media = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
-	$inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to <a href="https://codex.wordpress.org/Embeds">learn more about embeds</a>.' ) . '</p>';
+if ('post' == $post_type || 'page' == $post_type) {
+	$inserting_media = '<p>'.__('You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.').'</p>';
+	$inserting_media .= '<p>'.__('You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to <a href="https://codex.wordpress.org/Embeds">learn more about embeds</a>.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'inserting-media',
-		'title'		=> __( 'Inserting Media' ),
+		'title'		=> __('Inserting Media'),
 		'content' 	=> $inserting_media,
-	) );
+	));
 }
 
-if ( 'post' == $post_type ) {
-	$publish_box = '<p>' . __('Several boxes on this screen contain settings for how your content will be published, including:') . '</p>';
-	$publish_box .= '<ul><li>' .
-		__( '<strong>Publish</strong> &mdash; You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.' ) .
+if ('post' == $post_type) {
+	$publish_box = '<p>'.__('Several boxes on this screen contain settings for how your content will be published, including:').'</p>';
+	$publish_box .= '<ul><li>'.
+		__('<strong>Publish</strong> &mdash; You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.').
 	'</li>';
 
-	if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) {
-		$publish_box .= '<li>' . __( '<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="https://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.' ) . '</li>';
+	if (current_theme_supports('post-formats') && post_type_supports('post', 'post-formats')) {
+		$publish_box .= '<li>'.__('<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="https://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.').'</li>';
 	}
 
-	if ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
+	if (current_theme_supports('post-thumbnails') && post_type_supports('post', 'thumbnail')) {
 		/* translators: %s: Featured Image */
-		$publish_box .= '<li>' . sprintf( __( '<strong>%s</strong> &mdash; This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '</li>';
+		$publish_box .= '<li>'.sprintf(__('<strong>%s</strong> &mdash; This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.'), esc_html($post_type_object->labels->featured_image)).'</li>';
 	}
 
 	$publish_box .= '</ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'publish-box',
 		'title'   => __('Publish Settings'),
 		'content' => $publish_box,
-	) );
+	));
 
-	$discussion_settings  = '<p>' . __('<strong>Send Trackbacks</strong> &mdash; Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>';
-	$discussion_settings .= '<p>' . __('<strong>Discussion</strong> &mdash; You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>';
+	$discussion_settings  = '<p>'.__('<strong>Send Trackbacks</strong> &mdash; Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.').'</p>';
+	$discussion_settings .= '<p>'.__('<strong>Discussion</strong> &mdash; You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'discussion-settings',
 		'title'   => __('Discussion Settings'),
 		'content' => $discussion_settings,
-	) );
-} elseif ( 'page' == $post_type ) {
-	$page_attributes = '<p>' . __('<strong>Parent</strong> &mdash; You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
-		'<p>' . __('<strong>Template</strong> &mdash; Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
-		'<p>' . __('<strong>Order</strong> &mdash; Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
+	));
+} elseif ('page' == $post_type) {
+	$page_attributes = '<p>'.__('<strong>Parent</strong> &mdash; You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.').'</p>'.
+		'<p>'.__('<strong>Template</strong> &mdash; Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.').'</p>'.
+		'<p>'.__('<strong>Order</strong> &mdash; Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id' => 'page-attributes',
 		'title' => __('Page Attributes'),
 		'content' => $page_attributes,
-	) );
+	));
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $title );
+echo esc_html($title);
 ?></h1>
 
 <?php
-if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) {
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+if (isset($post_new_file) && current_user_can($post_type_object->cap->create_posts)) {
+	echo ' <a href="'.esc_url(admin_url($post_new_file)).'" class="page-title-action">'.esc_html($post_type_object->labels->add_new).'</a>';
 }
 ?>
 
 <hr class="wp-header-end">
 
-<?php if ( $notice ) : ?>
+<?php if ($notice) : ?>
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
 <?php endif; ?>
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="updated notice notice-success is-dismissible"><p><?php echo $message; ?></p></div>
 <?php endif; ?>
 <div id="lost-connection-notice" class="error hidden">
-	<p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.' ); ?>
-	<span class="hide-if-no-sessionstorage"><?php _e( 'We&#8217;re backing up this post in your browser, just in case.' ); ?></span>
+	<p><span class="spinner"></span> <?php _e('<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.'); ?>
+	<span class="hide-if-no-sessionstorage"><?php _e('We&#8217;re backing up this post in your browser, just in case.'); ?></span>
 	</p>
 </div>
 <form name="post" action="post.php" method="post" id="post"<?php
@@ -504,29 +504,29 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'post_edit_form_tag', $post );
+do_action('post_edit_form_tag', $post);
 
 $referer = wp_get_referer();
 ?>>
 <?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
-<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr( $form_action ) ?>" />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr( $form_action ) ?>" />
-<input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
-<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr( $post_type ) ?>" />
-<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status) ?>" />
-<input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
-<?php if ( ! empty( $active_post_lock ) ) { ?>
-<input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
+<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr($form_action) ?>" />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
+<input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr($post->post_author); ?>" />
+<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post_type) ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr($post->post_status) ?>" />
+<input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url($referer) : ''; ?>" />
+<?php if ( ! empty($active_post_lock)) { ?>
+<input type="hidden" id="active_post_lock" value="<?php echo esc_attr(implode(':', $active_post_lock)); ?>" />
 <?php
 }
-if ( 'draft' != get_post_status( $post ) )
+if ('draft' != get_post_status($post))
 	wp_original_referer_field(true, 'previous');
 
 echo $form_extra;
 
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 ?>
 
 <?php
@@ -539,13 +539,13 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_top', $post ); ?>
+do_action('edit_form_top', $post); ?>
 
 <div id="poststuff">
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content">
 
-<?php if ( post_type_supports($post_type, 'title') ) { ?>
+<?php if (post_type_supports($post_type, 'title')) { ?>
 <div id="titlediv">
 <div id="titlewrap">
 	<?php
@@ -557,10 +557,10 @@ 
 	 * @param string  $text Placeholder text. Default 'Enter title here'.
 	 * @param WP_Post $post Post object.
 	 */
-	$title_placeholder = apply_filters( 'enter_title_here', __( 'Enter title here' ), $post );
+	$title_placeholder = apply_filters('enter_title_here', __('Enter title here'), $post);
 	?>
 	<label class="screen-reader-text" id="title-prompt-text" for="title"><?php echo $title_placeholder; ?></label>
-	<input type="text" name="post_title" size="30" value="<?php echo esc_attr( $post->post_title ); ?>" id="title" spellcheck="true" autocomplete="off" />
+	<input type="text" name="post_title" size="30" value="<?php echo esc_attr($post->post_title); ?>" id="title" spellcheck="true" autocomplete="off" />
 </div>
 <?php
 /**
@@ -570,28 +570,28 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_before_permalink', $post );
+do_action('edit_form_before_permalink', $post);
 ?>
 <div class="inside">
 <?php
-if ( $viewable ) :
+if ($viewable) :
 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 
 // As of 4.4, the Get Shortlink button is hidden by default.
-if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+if (has_filter('pre_get_shortlink') || has_filter('get_shortlink')) {
 	$shortlink = wp_get_shortlink($post->ID, 'post');
 
-	if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) {
-    	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+	if ( ! empty($shortlink) && $shortlink !== $permalink && $permalink !== home_url('?page_id='.$post->ID)) {
+    	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="'.esc_attr($shortlink).'" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">'.__('Get Shortlink').'</a>';
 	}
 }
 
-if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+if ($post_type_object->public && ! ('pending' == get_post_status($post) && ! current_user_can($post_type_object->cap->publish_posts))) {
 	$has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
 ?>
 	<div id="edit-slug-box" class="hide-if-no-js">
 	<?php
-		if ( $has_sample_permalink )
+		if ($has_sample_permalink)
 			echo $sample_permalink_html;
 	?>
 	</div>
@@ -601,7 +601,7 @@ 
 ?>
 </div>
 <?php
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+wp_nonce_field('samplepermalink', 'samplepermalinknonce', false);
 ?>
 </div><!-- /titlediv -->
 <?php
@@ -613,13 +613,13 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_after_title', $post );
+do_action('edit_form_after_title', $post);
 
-if ( post_type_supports($post_type, 'editor') ) {
+if (post_type_supports($post_type, 'editor')) {
 ?>
-<div id="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">
+<div id="postdivrich" class="postarea<?php if ($_wp_editor_expand) { echo ' wp-editor-expand'; } ?>">
 
-<?php wp_editor( $post->post_content, 'content', array(
+<?php wp_editor($post->post_content, 'content', array(
 	'_content_editor_dfw' => $_content_editor_dfw,
 	'drag_drop_upload' => true,
 	'tabfocus_elements' => 'content-html,save-post',
@@ -629,20 +629,20 @@ 
 		'wp_autoresize_on' => $_wp_editor_expand,
 		'add_unload_trigger' => false,
 	),
-) ); ?>
+)); ?>
 <table id="post-status-info"><tbody><tr>
-	<td id="wp-word-count" class="hide-if-no-js"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
+	<td id="wp-word-count" class="hide-if-no-js"><?php printf(__('Word count: %s'), '<span class="word-count">0</span>'); ?></td>
 	<td class="autosave-info">
 	<span class="autosave-message">&nbsp;</span>
 <?php
-	if ( 'auto-draft' != $post->post_status ) {
+	if ('auto-draft' != $post->post_status) {
 		echo '<span id="last-edit">';
-		if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
+		if ($last_user = get_userdata(get_post_meta($post_ID, '_edit_last', true))) {
 			/* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
-			printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+			printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html($last_user->display_name), mysql2date(__('F j, Y'), $post->post_modified), mysql2date(__('g:i a'), $post->post_modified));
 		} else {
 			/* translators: 1: Post edited date, 2: Post edited time */
-			printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+			printf(__('Last edited on %1$s at %2$s'), mysql2date(__('F j, Y'), $post->post_modified), mysql2date(__('g:i a'), $post->post_modified));
 		}
 		echo '</span>';
 	} ?>
@@ -659,14 +659,14 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_after_editor', $post );
+do_action('edit_form_after_editor', $post);
 ?>
 </div><!-- /post-body-content -->
 
 <div id="postbox-container-1" class="postbox-container">
 <?php
 
-if ( 'page' == $post_type ) {
+if ('page' == $post_type) {
 	/**
 	 * Fires before meta boxes with 'side' context are output for the 'page' post type.
 	 *
@@ -676,7 +676,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'submitpage_box', $post );
+	do_action('submitpage_box', $post);
 }
 else {
 	/**
@@ -688,7 +688,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'submitpost_box', $post );
+	do_action('submitpost_box', $post);
 }
 
 
@@ -701,7 +701,7 @@ 
 
 do_meta_boxes(null, 'normal', $post);
 
-if ( 'page' == $post_type ) {
+if ('page' == $post_type) {
 	/**
 	 * Fires after 'normal' context meta boxes have been output for the 'page' post type.
 	 *
@@ -709,7 +709,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'edit_page_form', $post );
+	do_action('edit_page_form', $post);
 }
 else {
 	/**
@@ -719,7 +719,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'edit_form_advanced', $post );
+	do_action('edit_form_advanced', $post);
 }
 
 
@@ -735,7 +735,7 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'dbx_post_sidebar', $post );
+do_action('dbx_post_sidebar', $post);
 
 ?>
 </div><!-- /post-body -->
@@ -745,11 +745,11 @@ 
 </div>
 
 <?php
-if ( post_type_supports( $post_type, 'comments' ) )
+if (post_type_supports($post_type, 'comments'))
 	wp_comment_reply();
 ?>
 
-<?php if ( ! wp_is_mobile() && post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) : ?>
+<?php if ( ! wp_is_mobile() && post_type_supports($post_type, 'title') && '' === $post->post_title) : ?>
 <script type="text/javascript">
 try{document.post.title.focus();}catch(e){}
 </script>

Braces +45 added lines, -31 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 
 /**
  * @global string       $post_type
@@ -38,8 +39,9 @@ 
 	$_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
 }
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 /**
  * Post ID global
@@ -174,17 +176,19 @@ 
 $message = false;
 if ( isset($_GET['message']) ) {
 	$_GET['message'] = absint( $_GET['message'] );
-	if ( isset($messages[$post_type][$_GET['message']]) )
-		$message = $messages[$post_type][$_GET['message']];
-	elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
-		$message = $messages['post'][$_GET['message']];
-}
+	if ( isset($messages[$post_type][$_GET['message']]) ) {
+			$message = $messages[$post_type][$_GET['message']];
+	} elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) ) {
+			$message = $messages['post'][$_GET['message']];
+	}
+	}
 
 $notice = false;
 $form_extra = '';
 if ( 'auto-draft' == $post->post_status ) {
-	if ( 'edit' == $action )
-		$post->post_title = '';
+	if ( 'edit' == $action ) {
+			$post->post_title = '';
+	}
 	$autosave = false;
 	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
@@ -204,8 +208,9 @@ 
 		}
 	}
 	// If this autosave isn't different from the current post, begone.
-	if ( ! $notice )
-		wp_delete_post_revision( $autosave->ID );
+	if ( ! $notice ) {
+			wp_delete_post_revision( $autosave->ID );
+	}
 	unset($autosave_field, $_autosave_field);
 }
 
@@ -240,21 +245,24 @@ 
 	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core', $publish_callback_args );
 }
 
-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
+if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) ) {
 	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
+}
 
 // all taxonomies
 foreach ( get_object_taxonomies( $post ) as $tax_name ) {
 	$taxonomy = get_taxonomy( $tax_name );
-	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb )
-		continue;
+	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb ) {
+			continue;
+	}
 
 	$label = $taxonomy->labels->name;
 
-	if ( ! is_taxonomy_hierarchical( $tax_name ) )
-		$tax_meta_box_id = 'tagsdiv-' . $tax_name;
-	else
-		$tax_meta_box_id = $tax_name . 'div';
+	if ( ! is_taxonomy_hierarchical( $tax_name ) ) {
+			$tax_meta_box_id = 'tagsdiv-' . $tax_name;
+	} else {
+			$tax_meta_box_id = $tax_name . 'div';
+	}
 
 	add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
 }
@@ -263,17 +271,21 @@ 
 	add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core' );
 }
 
-if ( $thumbnail_support && current_user_can( 'upload_files' ) )
+if ( $thumbnail_support && current_user_can( 'upload_files' ) ) {
 	add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low');
+}
 
-if ( post_type_supports($post_type, 'excerpt') )
+if ( post_type_supports($post_type, 'excerpt') ) {
 	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
+}
 
-if ( post_type_supports($post_type, 'trackbacks') )
+if ( post_type_supports($post_type, 'trackbacks') ) {
 	add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
+}
 
-if ( post_type_supports($post_type, 'custom-fields') )
+if ( post_type_supports($post_type, 'custom-fields') ) {
 	add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
+}
 
 /**
  * Fires in the middle of built-in meta box registration.
@@ -305,8 +317,9 @@ 
 	}
 }
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
+if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
 	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
+}
 
 if ( post_type_supports( $post_type, 'author' ) && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
 	add_meta_box( 'authordiv', __( 'Author' ), 'post_author_meta_box', null, 'normal', 'core' );
@@ -520,8 +533,9 @@ 
 <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
 <?php
 }
-if ( 'draft' != get_post_status( $post ) )
+if ( 'draft' != get_post_status( $post ) ) {
 	wp_original_referer_field(true, 'previous');
+}
 
 echo $form_extra;
 
@@ -591,8 +605,9 @@ 
 ?>
 	<div id="edit-slug-box" class="hide-if-no-js">
 	<?php
-		if ( $has_sample_permalink )
-			echo $sample_permalink_html;
+		if ( $has_sample_permalink ) {
+					echo $sample_permalink_html;
+		}
 	?>
 	</div>
 <?php
@@ -677,8 +692,7 @@ 
 	 * @param WP_Post $post Post object.
 	 */
 	do_action( 'submitpage_box', $post );
-}
-else {
+} else {
 	/**
 	 * Fires before meta boxes with 'side' context are output for all post types other than 'page'.
 	 *
@@ -710,8 +724,7 @@ 
 	 * @param WP_Post $post Post object.
 	 */
 	do_action( 'edit_page_form', $post );
-}
-else {
+} else {
 	/**
 	 * Fires after 'normal' context meta boxes have been output for all post types other than 'page'.
 	 *
@@ -745,8 +758,9 @@ 
 </div>
 
 <?php
-if ( post_type_supports( $post_type, 'comments' ) )
+if ( post_type_supports( $post_type, 'comments' ) ) {
 	wp_comment_reply();
+}
 ?>
 
 <?php if ( ! wp_is_mobile() && post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) : ?>

src/wp-activate.php

Indentation +4 added lines, -4 removed lines

@@ -43,10 +43,10 @@
 	 * Fires before the Site Activation page is loaded.
 	 *
 	 * Fires on the {@see 'wp_head'} action.
-     *
-     * @since 3.0.0
-     */
-    do_action( 'activate_wp_head' );
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'activate_wp_head' );
 }
 add_action( 'wp_head', 'do_activate_header' );
 

Braces +5 added lines, -2 removed lines

@@ -18,8 +18,9 @@ 
 	die();
 }
 
-if ( is_object( $wp_object_cache ) )
+if ( is_object( $wp_object_cache ) ) {
 	$wp_object_cache->cache_enabled = false;
+}
 
 // Fix for page title
 $wp_query->is_404 = false;
@@ -144,10 +145,12 @@ 
 					/* translators: 1: site URL, 2: login URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
 				?></p>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<p class="view"><?php
 					/* translators: 1: login URL, 2: network home URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+}
 				?></p>
 			<?php endif;
 		}

Spacing +29 added lines, -29 removed lines

@@ -6,19 +6,19 @@ 
  * @package WordPress
  */
 
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require(dirname(__FILE__).'/wp-load.php');
 
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require(dirname(__FILE__).'/wp-blog-header.php');
 
-if ( !is_multisite() ) {
-	wp_redirect( wp_registration_url() );
+if ( ! is_multisite()) {
+	wp_redirect(wp_registration_url());
 	die();
 }
 
-if ( is_object( $wp_object_cache ) )
+if (is_object($wp_object_cache))
 	$wp_object_cache->cache_enabled = false;
 
 // Fix for page title
@@ -29,7 +29,7 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'activate_header' );
+do_action('activate_header');
 
 /**
  * Adds an action hook specific to this page.
@@ -46,9 +46,9 @@ 
      *
      * @since 3.0.0
      */
-    do_action( 'activate_wp_head' );
+    do_action('activate_wp_head');
 }
-add_action( 'wp_head', 'do_activate_header' );
+add_action('wp_head', 'do_activate_header');
 
 /**
  * Loads styles specific to this page.
@@ -66,14 +66,14 @@ 
 	</style>
 	<?php
 }
-add_action( 'wp_head', 'wpmu_activate_stylesheet' );
+add_action('wp_head', 'wpmu_activate_stylesheet');
 
-get_header( 'wp-activate' );
+get_header('wp-activate');
 ?>
 
 <div id="signup-content" class="widecolumn">
 	<div class="wp-activate-container">
-	<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
+	<?php if (empty($_GET['key']) && empty($_POST['key'])) { ?>
 
 		<h2><?php _e('Activation Key Required') ?></h2>
 		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
@@ -88,20 +88,20 @@ 
 
 	<?php } else {
 
-		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
-		$result = wpmu_activate_signup( $key );
-		if ( is_wp_error($result) ) {
-			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+		$key = ! empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+		$result = wpmu_activate_signup($key);
+		if (is_wp_error($result)) {
+			if ('already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code()) {
 				$signup = $result->get_error_data();
 				?>
 				<h2><?php _e('Your account is now active!'); ?></h2>
 				<?php
 				echo '<p class="lead-in">';
-				if ( $signup->domain . $signup->path == '' ) {
+				if ($signup->domain.$signup->path == '') {
 					printf(
 						/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
-						__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						network_site_url( 'wp-login.php', 'login' ),
+						__('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'),
+						network_site_url('wp-login.php', 'login'),
 						$signup->user_login,
 						$signup->user_email,
 						wp_lostpassword_url()
@@ -109,8 +109,8 @@ 
 				} else {
 					printf(
 						/* translators: 1: site URL, 2: site domain, 3: username, 4: user email, 5: lost password URL */
-						__( 'Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.' ),
-						'http://' . $signup->domain,
+						__('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'),
+						'http://'.$signup->domain,
 						$signup->domain,
 						$signup->user_login,
 						$signup->user_email,
@@ -120,13 +120,13 @@ 
 				echo '</p>';
 			} else {
 				?>
-				<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
+				<h2><?php _e('An error occurred during the activation'); ?></h2>
 				<p><?php echo $result->get_error_message(); ?></p>
 				<?php
 			}
 		} else {
-			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
-			$user = get_userdata( (int) $result['user_id'] );
+			$url = isset($result['blog_id']) ? get_home_url((int) $result['blog_id']) : '';
+			$user = get_userdata((int) $result['user_id']);
 			?>
 			<h2><?php _e('Your account is now active!'); ?></h2>
 
@@ -135,19 +135,19 @@ 
 				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
 			</div>
 
-			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
-				switch_to_blog( (int) $result['blog_id'] );
+			<?php if ($url && $url != network_home_url('', 'http')) :
+				switch_to_blog((int) $result['blog_id']);
 				$login_url = wp_login_url();
 				restore_current_blog();
 				?>
 				<p class="view"><?php
 					/* translators: 1: site URL, 2: login URL */
-					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
+					printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, esc_url($login_url));
 				?></p>
 			<?php else: ?>
 				<p class="view"><?php
 					/* translators: 1: login URL, 2: network home URL */
-					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+					printf(__('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.'), network_site_url('wp-login.php', 'login'), network_home_url());
 				?></p>
 			<?php endif;
 		}
@@ -159,4 +159,4 @@ 
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer( 'wp-activate' );
+<?php get_footer('wp-activate');

src/wp-settings.php

Braces +15 added lines, -9 removed lines

@@ -125,8 +125,9 @@ 
 register_shutdown_function( 'shutdown_action_hook' );
 
 // Stop most of WordPress from being loaded if we just want the basics.
-if ( SHORTINIT )
+if ( SHORTINIT ) {
 	return false;
+}
 
 // Load the L10n library.
 require_once( ABSPATH . WPINC . '/l10n.php' );
@@ -249,8 +250,9 @@ 
  */
 do_action( 'muplugins_loaded' );
 
-if ( is_multisite() )
+if ( is_multisite() ) {
 	ms_cookie_constants(  );
+}
 
 // Define constants after multisite is loaded.
 wp_cookie_constants();
@@ -284,8 +286,9 @@ 
 wp_set_internal_encoding();
 
 // Run wp_cache_postload() if object cache is enabled and the function exists.
-if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
+if ( WP_CACHE && function_exists( 'wp_cache_postload' ) ) {
 	wp_cache_postload();
+}
 
 /**
  * Fires once activated plugins have loaded.
@@ -367,8 +370,9 @@ 
 
 $locale = get_locale();
 $locale_file = WP_LANG_DIR . "/$locale.php";
-if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
+if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) ) {
 	require( $locale_file );
+}
 unset( $locale_file );
 
 // Pull in locale data after loading text domain.
@@ -383,11 +387,13 @@ 
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
-	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
-		include( STYLESHEETPATH . '/functions.php' );
-	if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
-		include( TEMPLATEPATH . '/functions.php' );
-}
+	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) {
+			include( STYLESHEETPATH . '/functions.php' );
+	}
+	if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) {
+			include( TEMPLATEPATH . '/functions.php' );
+	}
+	}
 
 /**
  * Fires after the theme is loaded.

Spacing +173 added lines, -173 removed lines

@@ -13,12 +13,12 @@ 
  *
  * @since 1.0.0
  */
-define( 'WPINC', 'wp-includes' );
+define('WPINC', 'wp-includes');
 
 // Include files required for initialization.
-require( ABSPATH . WPINC . '/load.php' );
-require( ABSPATH . WPINC . '/default-constants.php' );
-require_once( ABSPATH . WPINC . '/plugin.php' );
+require(ABSPATH.WPINC.'/load.php');
+require(ABSPATH.WPINC.'/default-constants.php');
+require_once(ABSPATH.WPINC.'/plugin.php');
 
 /*
  * These can't be directly globalized in version.php. When updating,
@@ -26,7 +26,7 @@ 
  * these values to be overridden if already set.
  */
 global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;
-require( ABSPATH . WPINC . '/version.php' );
+require(ABSPATH.WPINC.'/version.php');
 
 /**
  * If not already configured, `$blog_id` will default to 1 in a single site
@@ -44,11 +44,11 @@ 
 wp_check_php_mysql_versions();
 
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
-@ini_set( 'magic_quotes_runtime', 0 );
-@ini_set( 'magic_quotes_sybase',  0 );
+@ini_set('magic_quotes_runtime', 0);
+@ini_set('magic_quotes_sybase', 0);
 
 // WordPress calculates offsets from UTC.
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 // Turn register_globals off.
 wp_unregister_GLOBALS();
@@ -79,13 +79,13 @@ 
  * @param bool $enable_advanced_cache Whether to enable loading advanced-cache.php (if present).
  *                                    Default true.
  */
-if ( WP_CACHE && apply_filters( 'enable_loading_advanced_cache_dropin', true ) ) {
+if (WP_CACHE && apply_filters('enable_loading_advanced_cache_dropin', true)) {
 	// For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
-	WP_DEBUG ? include( WP_CONTENT_DIR . '/advanced-cache.php' ) : @include( WP_CONTENT_DIR . '/advanced-cache.php' );
+	WP_DEBUG ? include(WP_CONTENT_DIR.'/advanced-cache.php') : @include(WP_CONTENT_DIR.'/advanced-cache.php');
 
 	// Re-initialize any hooks added manually by advanced-cache.php
-	if ( $wp_filter ) {
-		$wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );
+	if ($wp_filter) {
+		$wp_filter = WP_Hook::build_preinitialized_hooks($wp_filter);
 	}
 }
 
@@ -93,14 +93,14 @@ 
 wp_set_lang_dir();
 
 // Load early WordPress files.
-require( ABSPATH . WPINC . '/compat.php' );
-require( ABSPATH . WPINC . '/class-wp-list-util.php' );
-require( ABSPATH . WPINC . '/functions.php' );
-require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );
-require( ABSPATH . WPINC . '/class-wp.php' );
-require( ABSPATH . WPINC . '/class-wp-error.php' );
-require( ABSPATH . WPINC . '/pomo/mo.php' );
-require( ABSPATH . WPINC . '/class-phpass.php' );
+require(ABSPATH.WPINC.'/compat.php');
+require(ABSPATH.WPINC.'/class-wp-list-util.php');
+require(ABSPATH.WPINC.'/functions.php');
+require(ABSPATH.WPINC.'/class-wp-matchesmapregex.php');
+require(ABSPATH.WPINC.'/class-wp.php');
+require(ABSPATH.WPINC.'/class-wp-error.php');
+require(ABSPATH.WPINC.'/pomo/mo.php');
+require(ABSPATH.WPINC.'/class-phpass.php');
 
 // Include the wpdb class and, if present, a db.php database drop-in.
 global $wpdb;
@@ -114,140 +114,140 @@ 
 wp_start_object_cache();
 
 // Attach the default filters.
-require( ABSPATH . WPINC . '/default-filters.php' );
+require(ABSPATH.WPINC.'/default-filters.php');
 
 // Initialize multisite if enabled.
-if ( is_multisite() ) {
-	require( ABSPATH . WPINC . '/class-wp-site-query.php' );
-	require( ABSPATH . WPINC . '/class-wp-network-query.php' );
-	require( ABSPATH . WPINC . '/ms-blogs.php' );
-	require( ABSPATH . WPINC . '/ms-settings.php' );
-} elseif ( ! defined( 'MULTISITE' ) ) {
-	define( 'MULTISITE', false );
+if (is_multisite()) {
+	require(ABSPATH.WPINC.'/class-wp-site-query.php');
+	require(ABSPATH.WPINC.'/class-wp-network-query.php');
+	require(ABSPATH.WPINC.'/ms-blogs.php');
+	require(ABSPATH.WPINC.'/ms-settings.php');
+} elseif ( ! defined('MULTISITE')) {
+	define('MULTISITE', false);
 }
 
-register_shutdown_function( 'shutdown_action_hook' );
+register_shutdown_function('shutdown_action_hook');
 
 // Stop most of WordPress from being loaded if we just want the basics.
-if ( SHORTINIT )
+if (SHORTINIT)
 	return false;
 
 // Load the L10n library.
-require_once( ABSPATH . WPINC . '/l10n.php' );
-require_once( ABSPATH . WPINC . '/class-wp-locale.php' );
-require_once( ABSPATH . WPINC . '/class-wp-locale-switcher.php' );
+require_once(ABSPATH.WPINC.'/l10n.php');
+require_once(ABSPATH.WPINC.'/class-wp-locale.php');
+require_once(ABSPATH.WPINC.'/class-wp-locale-switcher.php');
 
 // Run the installer if WordPress is not installed.
 wp_not_installed();
 
 // Load most of WordPress.
-require( ABSPATH . WPINC . '/class-wp-walker.php' );
-require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );
-require( ABSPATH . WPINC . '/formatting.php' );
-require( ABSPATH . WPINC . '/capabilities.php' );
-require( ABSPATH . WPINC . '/class-wp-roles.php' );
-require( ABSPATH . WPINC . '/class-wp-role.php' );
-require( ABSPATH . WPINC . '/class-wp-user.php' );
-require( ABSPATH . WPINC . '/class-wp-query.php' );
-require( ABSPATH . WPINC . '/query.php' );
-require( ABSPATH . WPINC . '/date.php' );
-require( ABSPATH . WPINC . '/theme.php' );
-require( ABSPATH . WPINC . '/class-wp-theme.php' );
-require( ABSPATH . WPINC . '/template.php' );
-require( ABSPATH . WPINC . '/user.php' );
-require( ABSPATH . WPINC . '/class-wp-user-query.php' );
-require( ABSPATH . WPINC . '/class-wp-session-tokens.php' );
-require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' );
-require( ABSPATH . WPINC . '/meta.php' );
-require( ABSPATH . WPINC . '/class-wp-meta-query.php' );
-require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' );
-require( ABSPATH . WPINC . '/general-template.php' );
-require( ABSPATH . WPINC . '/link-template.php' );
-require( ABSPATH . WPINC . '/author-template.php' );
-require( ABSPATH . WPINC . '/post.php' );
-require( ABSPATH . WPINC . '/class-walker-page.php' );
-require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' );
-require( ABSPATH . WPINC . '/class-wp-post-type.php' );
-require( ABSPATH . WPINC . '/class-wp-post.php' );
-require( ABSPATH . WPINC . '/post-template.php' );
-require( ABSPATH . WPINC . '/revision.php' );
-require( ABSPATH . WPINC . '/post-formats.php' );
-require( ABSPATH . WPINC . '/post-thumbnail-template.php' );
-require( ABSPATH . WPINC . '/category.php' );
-require( ABSPATH . WPINC . '/class-walker-category.php' );
-require( ABSPATH . WPINC . '/class-walker-category-dropdown.php' );
-require( ABSPATH . WPINC . '/category-template.php' );
-require( ABSPATH . WPINC . '/comment.php' );
-require( ABSPATH . WPINC . '/class-wp-comment.php' );
-require( ABSPATH . WPINC . '/class-wp-comment-query.php' );
-require( ABSPATH . WPINC . '/class-walker-comment.php' );
-require( ABSPATH . WPINC . '/comment-template.php' );
-require( ABSPATH . WPINC . '/rewrite.php' );
-require( ABSPATH . WPINC . '/class-wp-rewrite.php' );
-require( ABSPATH . WPINC . '/feed.php' );
-require( ABSPATH . WPINC . '/bookmark.php' );
-require( ABSPATH . WPINC . '/bookmark-template.php' );
-require( ABSPATH . WPINC . '/kses.php' );
-require( ABSPATH . WPINC . '/cron.php' );
-require( ABSPATH . WPINC . '/deprecated.php' );
-require( ABSPATH . WPINC . '/script-loader.php' );
-require( ABSPATH . WPINC . '/taxonomy.php' );
-require( ABSPATH . WPINC . '/class-wp-taxonomy.php' );
-require( ABSPATH . WPINC . '/class-wp-term.php' );
-require( ABSPATH . WPINC . '/class-wp-term-query.php' );
-require( ABSPATH . WPINC . '/class-wp-tax-query.php' );
-require( ABSPATH . WPINC . '/update.php' );
-require( ABSPATH . WPINC . '/canonical.php' );
-require( ABSPATH . WPINC . '/shortcodes.php' );
-require( ABSPATH . WPINC . '/embed.php' );
-require( ABSPATH . WPINC . '/class-wp-embed.php' );
-require( ABSPATH . WPINC . '/class-oembed.php' );
-require( ABSPATH . WPINC . '/class-wp-oembed-controller.php' );
-require( ABSPATH . WPINC . '/media.php' );
-require( ABSPATH . WPINC . '/http.php' );
-require( ABSPATH . WPINC . '/class-http.php' );
-require( ABSPATH . WPINC . '/class-wp-http-streams.php' );
-require( ABSPATH . WPINC . '/class-wp-http-curl.php' );
-require( ABSPATH . WPINC . '/class-wp-http-proxy.php' );
-require( ABSPATH . WPINC . '/class-wp-http-cookie.php' );
-require( ABSPATH . WPINC . '/class-wp-http-encoding.php' );
-require( ABSPATH . WPINC . '/class-wp-http-response.php' );
-require( ABSPATH . WPINC . '/class-wp-http-requests-response.php' );
-require( ABSPATH . WPINC . '/class-wp-http-requests-hooks.php' );
-require( ABSPATH . WPINC . '/widgets.php' );
-require( ABSPATH . WPINC . '/class-wp-widget.php' );
-require( ABSPATH . WPINC . '/class-wp-widget-factory.php' );
-require( ABSPATH . WPINC . '/nav-menu.php' );
-require( ABSPATH . WPINC . '/nav-menu-template.php' );
-require( ABSPATH . WPINC . '/admin-bar.php' );
-require( ABSPATH . WPINC . '/rest-api.php' );
-require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' );
-require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' );
-require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-posts-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-attachments-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-post-types-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-post-statuses-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-revisions-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-taxonomies-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-terms-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-users-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-comments-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-settings-controller.php' );
-require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php' );
-require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-comment-meta-fields.php' );
-require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-post-meta-fields.php' );
-require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-term-meta-fields.php' );
-require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-user-meta-fields.php' );
+require(ABSPATH.WPINC.'/class-wp-walker.php');
+require(ABSPATH.WPINC.'/class-wp-ajax-response.php');
+require(ABSPATH.WPINC.'/formatting.php');
+require(ABSPATH.WPINC.'/capabilities.php');
+require(ABSPATH.WPINC.'/class-wp-roles.php');
+require(ABSPATH.WPINC.'/class-wp-role.php');
+require(ABSPATH.WPINC.'/class-wp-user.php');
+require(ABSPATH.WPINC.'/class-wp-query.php');
+require(ABSPATH.WPINC.'/query.php');
+require(ABSPATH.WPINC.'/date.php');
+require(ABSPATH.WPINC.'/theme.php');
+require(ABSPATH.WPINC.'/class-wp-theme.php');
+require(ABSPATH.WPINC.'/template.php');
+require(ABSPATH.WPINC.'/user.php');
+require(ABSPATH.WPINC.'/class-wp-user-query.php');
+require(ABSPATH.WPINC.'/class-wp-session-tokens.php');
+require(ABSPATH.WPINC.'/class-wp-user-meta-session-tokens.php');
+require(ABSPATH.WPINC.'/meta.php');
+require(ABSPATH.WPINC.'/class-wp-meta-query.php');
+require(ABSPATH.WPINC.'/class-wp-metadata-lazyloader.php');
+require(ABSPATH.WPINC.'/general-template.php');
+require(ABSPATH.WPINC.'/link-template.php');
+require(ABSPATH.WPINC.'/author-template.php');
+require(ABSPATH.WPINC.'/post.php');
+require(ABSPATH.WPINC.'/class-walker-page.php');
+require(ABSPATH.WPINC.'/class-walker-page-dropdown.php');
+require(ABSPATH.WPINC.'/class-wp-post-type.php');
+require(ABSPATH.WPINC.'/class-wp-post.php');
+require(ABSPATH.WPINC.'/post-template.php');
+require(ABSPATH.WPINC.'/revision.php');
+require(ABSPATH.WPINC.'/post-formats.php');
+require(ABSPATH.WPINC.'/post-thumbnail-template.php');
+require(ABSPATH.WPINC.'/category.php');
+require(ABSPATH.WPINC.'/class-walker-category.php');
+require(ABSPATH.WPINC.'/class-walker-category-dropdown.php');
+require(ABSPATH.WPINC.'/category-template.php');
+require(ABSPATH.WPINC.'/comment.php');
+require(ABSPATH.WPINC.'/class-wp-comment.php');
+require(ABSPATH.WPINC.'/class-wp-comment-query.php');
+require(ABSPATH.WPINC.'/class-walker-comment.php');
+require(ABSPATH.WPINC.'/comment-template.php');
+require(ABSPATH.WPINC.'/rewrite.php');
+require(ABSPATH.WPINC.'/class-wp-rewrite.php');
+require(ABSPATH.WPINC.'/feed.php');
+require(ABSPATH.WPINC.'/bookmark.php');
+require(ABSPATH.WPINC.'/bookmark-template.php');
+require(ABSPATH.WPINC.'/kses.php');
+require(ABSPATH.WPINC.'/cron.php');
+require(ABSPATH.WPINC.'/deprecated.php');
+require(ABSPATH.WPINC.'/script-loader.php');
+require(ABSPATH.WPINC.'/taxonomy.php');
+require(ABSPATH.WPINC.'/class-wp-taxonomy.php');
+require(ABSPATH.WPINC.'/class-wp-term.php');
+require(ABSPATH.WPINC.'/class-wp-term-query.php');
+require(ABSPATH.WPINC.'/class-wp-tax-query.php');
+require(ABSPATH.WPINC.'/update.php');
+require(ABSPATH.WPINC.'/canonical.php');
+require(ABSPATH.WPINC.'/shortcodes.php');
+require(ABSPATH.WPINC.'/embed.php');
+require(ABSPATH.WPINC.'/class-wp-embed.php');
+require(ABSPATH.WPINC.'/class-oembed.php');
+require(ABSPATH.WPINC.'/class-wp-oembed-controller.php');
+require(ABSPATH.WPINC.'/media.php');
+require(ABSPATH.WPINC.'/http.php');
+require(ABSPATH.WPINC.'/class-http.php');
+require(ABSPATH.WPINC.'/class-wp-http-streams.php');
+require(ABSPATH.WPINC.'/class-wp-http-curl.php');
+require(ABSPATH.WPINC.'/class-wp-http-proxy.php');
+require(ABSPATH.WPINC.'/class-wp-http-cookie.php');
+require(ABSPATH.WPINC.'/class-wp-http-encoding.php');
+require(ABSPATH.WPINC.'/class-wp-http-response.php');
+require(ABSPATH.WPINC.'/class-wp-http-requests-response.php');
+require(ABSPATH.WPINC.'/class-wp-http-requests-hooks.php');
+require(ABSPATH.WPINC.'/widgets.php');
+require(ABSPATH.WPINC.'/class-wp-widget.php');
+require(ABSPATH.WPINC.'/class-wp-widget-factory.php');
+require(ABSPATH.WPINC.'/nav-menu.php');
+require(ABSPATH.WPINC.'/nav-menu-template.php');
+require(ABSPATH.WPINC.'/admin-bar.php');
+require(ABSPATH.WPINC.'/rest-api.php');
+require(ABSPATH.WPINC.'/rest-api/class-wp-rest-server.php');
+require(ABSPATH.WPINC.'/rest-api/class-wp-rest-response.php');
+require(ABSPATH.WPINC.'/rest-api/class-wp-rest-request.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-posts-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-attachments-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-post-types-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-post-statuses-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-revisions-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-taxonomies-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-terms-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-users-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-comments-controller.php');
+require(ABSPATH.WPINC.'/rest-api/endpoints/class-wp-rest-settings-controller.php');
+require(ABSPATH.WPINC.'/rest-api/fields/class-wp-rest-meta-fields.php');
+require(ABSPATH.WPINC.'/rest-api/fields/class-wp-rest-comment-meta-fields.php');
+require(ABSPATH.WPINC.'/rest-api/fields/class-wp-rest-post-meta-fields.php');
+require(ABSPATH.WPINC.'/rest-api/fields/class-wp-rest-term-meta-fields.php');
+require(ABSPATH.WPINC.'/rest-api/fields/class-wp-rest-user-meta-fields.php');
 
 $GLOBALS['wp_embed'] = new WP_Embed();
 
 // Load multisite-specific files.
-if ( is_multisite() ) {
-	require( ABSPATH . WPINC . '/ms-functions.php' );
-	require( ABSPATH . WPINC . '/ms-default-filters.php' );
-	require( ABSPATH . WPINC . '/ms-deprecated.php' );
+if (is_multisite()) {
+	require(ABSPATH.WPINC.'/ms-functions.php');
+	require(ABSPATH.WPINC.'/ms-default-filters.php');
+	require(ABSPATH.WPINC.'/ms-deprecated.php');
 }
 
 // Define constants that rely on the API to obtain the default value.
@@ -257,18 +257,18 @@ 
 $GLOBALS['wp_plugin_paths'] = array();
 
 // Load must-use plugins.
-foreach ( wp_get_mu_plugins() as $mu_plugin ) {
-	include_once( $mu_plugin );
+foreach (wp_get_mu_plugins() as $mu_plugin) {
+	include_once($mu_plugin);
 }
-unset( $mu_plugin );
+unset($mu_plugin);
 
 // Load network activated plugins.
-if ( is_multisite() ) {
-	foreach ( wp_get_active_network_plugins() as $network_plugin ) {
-		wp_register_plugin_realpath( $network_plugin );
-		include_once( $network_plugin );
+if (is_multisite()) {
+	foreach (wp_get_active_network_plugins() as $network_plugin) {
+		wp_register_plugin_realpath($network_plugin);
+		include_once($network_plugin);
 	}
-	unset( $network_plugin );
+	unset($network_plugin);
 }
 
 /**
@@ -276,9 +276,9 @@ 
  *
  * @since 2.8.0
  */
-do_action( 'muplugins_loaded' );
+do_action('muplugins_loaded');
 
-if ( is_multisite() )
+if (is_multisite())
 	ms_cookie_constants(  );
 
 // Define constants after multisite is loaded.
@@ -288,7 +288,7 @@ 
 wp_ssl_constants();
 
 // Create common globals.
-require( ABSPATH . WPINC . '/vars.php' );
+require(ABSPATH.WPINC.'/vars.php');
 
 // Make taxonomies and posts available to plugins and themes.
 // @plugin authors: warning: these get registered again on the init hook.
@@ -296,24 +296,24 @@ 
 create_initial_post_types();
 
 // Register the default theme directory root
-register_theme_directory( get_theme_root() );
+register_theme_directory(get_theme_root());
 
 // Load active plugins.
-foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
-	wp_register_plugin_realpath( $plugin );
-	include_once( $plugin );
+foreach (wp_get_active_and_valid_plugins() as $plugin) {
+	wp_register_plugin_realpath($plugin);
+	include_once($plugin);
 }
-unset( $plugin );
+unset($plugin);
 
 // Load pluggable functions.
-require( ABSPATH . WPINC . '/pluggable.php' );
-require( ABSPATH . WPINC . '/pluggable-deprecated.php' );
+require(ABSPATH.WPINC.'/pluggable.php');
+require(ABSPATH.WPINC.'/pluggable-deprecated.php');
 
 // Set internal encoding.
 wp_set_internal_encoding();
 
 // Run wp_cache_postload() if object cache is enabled and the function exists.
-if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
+if (WP_CACHE && function_exists('wp_cache_postload'))
 	wp_cache_postload();
 
 /**
@@ -323,7 +323,7 @@ 
  *
  * @since 1.5.0
  */
-do_action( 'plugins_loaded' );
+do_action('plugins_loaded');
 
 // Define constants which affect functionality if not already defined.
 wp_functionality_constants();
@@ -336,7 +336,7 @@ 
  *
  * @since 2.0.11
  */
-do_action( 'sanitize_comment_cookies' );
+do_action('sanitize_comment_cookies');
 
 /**
  * WordPress Query object
@@ -386,7 +386,7 @@ 
  *
  * @since 2.6.0
  */
-do_action( 'setup_theme' );
+do_action('setup_theme');
 
 // Define the template related constants.
 wp_templating_constants(  );
@@ -395,10 +395,10 @@ 
 load_default_textdomain();
 
 $locale = get_locale();
-$locale_file = WP_LANG_DIR . "/$locale.php";
-if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
-	require( $locale_file );
-unset( $locale_file );
+$locale_file = WP_LANG_DIR."/$locale.php";
+if ((0 === validate_file($locale)) && is_readable($locale_file))
+	require($locale_file);
+unset($locale_file);
 
 /**
  * WordPress Locale object for loading locale domain date and various strings.
@@ -418,11 +418,11 @@ 
 $GLOBALS['wp_locale_switcher']->init();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
-if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
-	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
-		include( STYLESHEETPATH . '/functions.php' );
-	if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
-		include( TEMPLATEPATH . '/functions.php' );
+if ( ! wp_installing() || 'wp-activate.php' === $pagenow) {
+	if (TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH.'/functions.php'))
+		include(STYLESHEETPATH.'/functions.php');
+	if (file_exists(TEMPLATEPATH.'/functions.php'))
+		include(TEMPLATEPATH.'/functions.php');
 }
 
 /**
@@ -430,7 +430,7 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'after_setup_theme' );
+do_action('after_setup_theme');
 
 // Set up current user.
 $GLOBALS['wp']->init();
@@ -446,12 +446,12 @@ 
  *
  * @since 1.5.0
  */
-do_action( 'init' );
+do_action('init');
 
 // Check site status
-if ( is_multisite() ) {
-	if ( true !== ( $file = ms_site_check() ) ) {
-		require( $file );
+if (is_multisite()) {
+	if (true !== ($file = ms_site_check())) {
+		require($file);
 		die();
 	}
 	unset($file);
@@ -467,4 +467,4 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'wp_loaded' );
+do_action('wp_loaded');

src/wp-includes/date.php

Doc Comments +1 added lines, -1 removed lines

@@ -804,7 +804,7 @@
 	 *
 	 * @param string $compare The compare operator to use
 	 * @param string|array $value The value
-	 * @return string|false|int The value to be used in SQL or false on error.
+	 * @return string The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
 		if ( ! isset( $value ) )

Spacing +197 added lines, -197 removed lines

@@ -60,7 +60,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
+	public $time_keys = array('after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second');
 
 	/**
 	 * Constructor.
@@ -150,37 +150,37 @@ 
 	 *                              Accepts 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt',
 	 *                              'comment_date', 'comment_date_gmt'.
 	 */
-	public function __construct( $date_query, $default_column = 'post_date' ) {
-		if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
+	public function __construct($date_query, $default_column = 'post_date') {
+		if (isset($date_query['relation']) && 'OR' === strtoupper($date_query['relation'])) {
 			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
 
-		if ( ! is_array( $date_query ) ) {
+		if ( ! is_array($date_query)) {
 			return;
 		}
 
 		// Support for passing time-based keys in the top level of the $date_query array.
-		if ( ! isset( $date_query[0] ) && ! empty( $date_query ) ) {
-			$date_query = array( $date_query );
+		if ( ! isset($date_query[0]) && ! empty($date_query)) {
+			$date_query = array($date_query);
 		}
 
-		if ( empty( $date_query ) ) {
+		if (empty($date_query)) {
 			return;
 		}
 
-		if ( ! empty( $date_query['column'] ) ) {
-			$date_query['column'] = esc_sql( $date_query['column'] );
+		if ( ! empty($date_query['column'])) {
+			$date_query['column'] = esc_sql($date_query['column']);
 		} else {
-			$date_query['column'] = esc_sql( $default_column );
+			$date_query['column'] = esc_sql($default_column);
 		}
 
-		$this->column = $this->validate_column( $this->column );
+		$this->column = $this->validate_column($this->column);
 
-		$this->compare = $this->get_compare( $date_query );
+		$this->compare = $this->get_compare($date_query);
 
-		$this->queries = $this->sanitize_query( $date_query );
+		$this->queries = $this->sanitize_query($date_query);
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 *
 	 * @return array Sanitized queries.
 	 */
-	public function sanitize_query( $queries, $parent_query = null ) {
+	public function sanitize_query($queries, $parent_query = null) {
 		$cleaned_query = array();
 
 		$defaults = array(
@@ -208,37 +208,37 @@ 
 		);
 
 		// Numeric keys should always have array values.
-		foreach ( $queries as $qkey => $qvalue ) {
-			if ( is_numeric( $qkey ) && ! is_array( $qvalue ) ) {
-				unset( $queries[ $qkey ] );
+		foreach ($queries as $qkey => $qvalue) {
+			if (is_numeric($qkey) && ! is_array($qvalue)) {
+				unset($queries[$qkey]);
 			}
 		}
 
 		// Each query should have a value for each default key. Inherit from the parent when possible.
-		foreach ( $defaults as $dkey => $dvalue ) {
-			if ( isset( $queries[ $dkey ] ) ) {
+		foreach ($defaults as $dkey => $dvalue) {
+			if (isset($queries[$dkey])) {
 				continue;
 			}
 
-			if ( isset( $parent_query[ $dkey ] ) ) {
-				$queries[ $dkey ] = $parent_query[ $dkey ];
+			if (isset($parent_query[$dkey])) {
+				$queries[$dkey] = $parent_query[$dkey];
 			} else {
-				$queries[ $dkey ] = $dvalue;
+				$queries[$dkey] = $dvalue;
 			}
 		}
 
 		// Validate the dates passed in the query.
-		if ( $this->is_first_order_clause( $queries ) ) {
-			$this->validate_date_values( $queries );
+		if ($this->is_first_order_clause($queries)) {
+			$this->validate_date_values($queries);
 		}
 
-		foreach ( $queries as $key => $q ) {
-			if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
+		foreach ($queries as $key => $q) {
+			if ( ! is_array($q) || in_array($key, $this->time_keys, true)) {
 				// This is a first-order query. Trust the values and sanitize when building SQL.
-				$cleaned_query[ $key ] = $q;
+				$cleaned_query[$key] = $q;
 			} else {
 				// Any array without a time key is another query, so we recurse.
-				$cleaned_query[] = $this->sanitize_query( $q, $queries );
+				$cleaned_query[] = $this->sanitize_query($q, $queries);
 			}
 		}
 
@@ -257,9 +257,9 @@ 
 	 * @param  array $query Query clause.
 	 * @return bool True if this is a first-order clause.
 	 */
-	protected function is_first_order_clause( $query ) {
-		$time_keys = array_intersect( $this->time_keys, array_keys( $query ) );
-		return ! empty( $time_keys );
+	protected function is_first_order_clause($query) {
+		$time_keys = array_intersect($this->time_keys, array_keys($query));
+		return ! empty($time_keys);
 	}
 
 	/**
@@ -271,9 +271,9 @@ 
 	 * @param array $query A date query or a date subquery.
 	 * @return string The comparison operator.
 	 */
-	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+	public function get_compare($query) {
+		if ( ! empty($query['compare']) && in_array($query['compare'], array('=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN')))
+			return strtoupper($query['compare']);
 
 		return $this->compare;
 	}
@@ -291,8 +291,8 @@ 
 	 * @param  array $date_query The date_query array.
 	 * @return bool  True if all values in the query are valid, false if one or more fail.
 	 */
-	public function validate_date_values( $date_query = array() ) {
-		if ( empty( $date_query ) ) {
+	public function validate_date_values($date_query = array()) {
+		if (empty($date_query)) {
 			return false;
 		}
 
@@ -303,30 +303,30 @@ 
 		 * validation routine continue to be sure that all invalid
 		 * values generate errors too.
 		 */
-		if ( array_key_exists( 'before', $date_query ) && is_array( $date_query['before'] ) ){
-			$valid = $this->validate_date_values( $date_query['before'] );
+		if (array_key_exists('before', $date_query) && is_array($date_query['before'])) {
+			$valid = $this->validate_date_values($date_query['before']);
 		}
 
-		if ( array_key_exists( 'after', $date_query ) && is_array( $date_query['after'] ) ){
-			$valid = $this->validate_date_values( $date_query['after'] );
+		if (array_key_exists('after', $date_query) && is_array($date_query['after'])) {
+			$valid = $this->validate_date_values($date_query['after']);
 		}
 
 		// Array containing all min-max checks.
 		$min_max_checks = array();
 
 		// Days per year.
-		if ( array_key_exists( 'year', $date_query ) ) {
+		if (array_key_exists('year', $date_query)) {
 			/*
 			 * If a year exists in the date query, we can use it to get the days.
 			 * If multiple years are provided (as in a BETWEEN), use the first one.
 			 */
-			if ( is_array( $date_query['year'] ) ) {
-				$_year = reset( $date_query['year'] );
+			if (is_array($date_query['year'])) {
+				$_year = reset($date_query['year']);
 			} else {
 				$_year = $date_query['year'];
 			}
 
-			$max_days_of_year = date( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 1;
+			$max_days_of_year = date('z', mktime(0, 0, 0, 12, 31, $_year)) + 1;
 		} else {
 			// otherwise we use the max of 366 (leap-year)
 			$max_days_of_year = 366;
@@ -356,12 +356,12 @@ 
 		);
 
 		// Weeks per year.
-		if ( isset( $_year ) ) {
+		if (isset($_year)) {
 			/*
 			 * If we have a specific year, use it to calculate number of weeks.
 			 * Note: the number of weeks in a year is the date in which Dec 28 appears.
 			 */
-			$week_count = date( 'W', mktime( 0, 0, 0, 12, 28, $_year ) );
+			$week_count = date('W', mktime(0, 0, 0, 12, 28, $_year));
 
 		} else {
 			// Otherwise set the week-count to a maximum of 53.
@@ -398,26 +398,26 @@ 
 		);
 
 		// Concatenate and throw a notice for each invalid value.
-		foreach ( $min_max_checks as $key => $check ) {
-			if ( ! array_key_exists( $key, $date_query ) ) {
+		foreach ($min_max_checks as $key => $check) {
+			if ( ! array_key_exists($key, $date_query)) {
 				continue;
 			}
 
 			// Throw a notice for each failing value.
-			foreach ( (array) $date_query[ $key ] as $_value ) {
+			foreach ((array) $date_query[$key] as $_value) {
 				$is_between = $_value >= $check['min'] && $_value <= $check['max'];
 
-				if ( ! is_numeric( $_value ) || ! $is_between ) {
+				if ( ! is_numeric($_value) || ! $is_between) {
 					$error = sprintf(
 						/* translators: Date query invalid date message: 1: invalid value, 2: type of value, 3: minimum valid value, 4: maximum valid value */
-						__( 'Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.' ),
-						'<code>' . esc_html( $_value ) . '</code>',
-						'<code>' . esc_html( $key ) . '</code>',
-						'<code>' . esc_html( $check['min'] ) . '</code>',
-						'<code>' . esc_html( $check['max'] ) . '</code>'
+						__('Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.'),
+						'<code>'.esc_html($_value).'</code>',
+						'<code>'.esc_html($key).'</code>',
+						'<code>'.esc_html($check['min']).'</code>',
+						'<code>'.esc_html($check['max']).'</code>'
 					);
 
-					_doing_it_wrong( __CLASS__, $error, '4.1.0' );
+					_doing_it_wrong(__CLASS__, $error, '4.1.0');
 
 					$valid = false;
 				}
@@ -425,49 +425,49 @@ 
 		}
 
 		// If we already have invalid date messages, don't bother running through checkdate().
-		if ( ! $valid ) {
+		if ( ! $valid) {
 			return $valid;
 		}
 
 		$day_month_year_error_msg = '';
 
-		$day_exists   = array_key_exists( 'day', $date_query ) && is_numeric( $date_query['day'] );
-		$month_exists = array_key_exists( 'month', $date_query ) && is_numeric( $date_query['month'] );
-		$year_exists  = array_key_exists( 'year', $date_query ) && is_numeric( $date_query['year'] );
+		$day_exists   = array_key_exists('day', $date_query) && is_numeric($date_query['day']);
+		$month_exists = array_key_exists('month', $date_query) && is_numeric($date_query['month']);
+		$year_exists  = array_key_exists('year', $date_query) && is_numeric($date_query['year']);
 
-		if ( $day_exists && $month_exists && $year_exists ) {
+		if ($day_exists && $month_exists && $year_exists) {
 			// 1. Checking day, month, year combination.
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], $date_query['year'], sprintf( '%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], $date_query['year'], sprintf('%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day']))) {
 				/* translators: 1: year, 2: month, 3: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.' ),
-					'<code>' . esc_html( $date_query['year'] ) . '</code>',
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.'),
+					'<code>'.esc_html($date_query['year']).'</code>',
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 
-		} elseif ( $day_exists && $month_exists ) {
+		} elseif ($day_exists && $month_exists) {
 			/*
 			 * 2. checking day, month combination
 			 * We use 2012 because, as a leap year, it's the most permissive.
 			 */
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], 2012, sprintf( '2012-%s-%s', $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], 2012, sprintf('2012-%s-%s', $date_query['month'], $date_query['day']))) {
 				/* translators: 1: month, 2: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: month %1$s, day %2$s.' ),
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: month %1$s, day %2$s.'),
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 		}
 
-		if ( ! empty( $day_month_year_error_msg ) ) {
-			_doing_it_wrong( __CLASS__, $day_month_year_error_msg, '4.1.0' );
+		if ( ! empty($day_month_year_error_msg)) {
+			_doing_it_wrong(__CLASS__, $day_month_year_error_msg, '4.1.0');
 		}
 
 		return $valid;
@@ -487,7 +487,7 @@ 
 	 * @param string $column The user-supplied column name.
 	 * @return string A validated column name value.
 	 */
-	public function validate_column( $column ) {
+	public function validate_column($column) {
 		global $wpdb;
 
 		$valid_columns = array(
@@ -497,7 +497,7 @@ 
 		);
 
 		// Attempt to detect a table prefix.
-		if ( false === strpos( $column, '.' ) ) {
+		if (false === strpos($column, '.')) {
 			/**
 			 * Filters the list of valid date query columns.
 			 *
@@ -509,7 +509,7 @@ 
 			 *                             'post_modified_gmt', 'comment_date', 'comment_date_gmt',
 			 *	                           'user_registered'
 			 */
-			if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
+			if ( ! in_array($column, apply_filters('date_query_valid_columns', $valid_columns))) {
 				$column = 'post_date';
 			}
 
@@ -534,9 +534,9 @@ 
 			);
 
 			// If it's a known column name, add the appropriate table prefix.
-			foreach ( $known_columns as $table_name => $table_columns ) {
-				if ( in_array( $column, $table_columns ) ) {
-					$column = $table_name . '.' . $column;
+			foreach ($known_columns as $table_name => $table_columns) {
+				if (in_array($column, $table_columns)) {
+					$column = $table_name.'.'.$column;
 					break;
 				}
 			}
@@ -544,7 +544,7 @@ 
 		}
 
 		// Remove unsafe characters.
-		return preg_replace( '/[^a-zA-Z0-9_$\.]/', '', $column );
+		return preg_replace('/[^a-zA-Z0-9_$\.]/', '', $column);
 	}
 
 	/**
@@ -568,7 +568,7 @@ 
 		 * @param string        $where WHERE clause of the date query.
 		 * @param WP_Date_Query $this  The WP_Date_Query instance.
 		 */
-		return apply_filters( 'get_date_sql', $where, $this );
+		return apply_filters('get_date_sql', $where, $this);
 	}
 
 	/**
@@ -588,10 +588,10 @@ 
 	 * }
 	 */
 	protected function get_sql_clauses() {
-		$sql = $this->get_sql_for_query( $this->queries );
+		$sql = $this->get_sql_for_query($this->queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -616,7 +616,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( $query, $depth = 0 ) {
+	protected function get_sql_for_query($query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -628,32 +628,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => $clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => $clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -662,21 +662,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -699,8 +699,8 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_subquery( $query ) {
-		return $this->get_sql_for_clause( $query, '' );
+	protected function get_sql_for_subquery($query) {
+		return $this->get_sql_for_clause($query, '');
 	}
 
 	/**
@@ -718,72 +718,72 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_clause( $query, $parent_query ) {
+	protected function get_sql_for_clause($query, $parent_query) {
 		global $wpdb;
 
 		// The sub-parts of a $where part.
 		$where_parts = array();
 
-		$column = ( ! empty( $query['column'] ) ) ? esc_sql( $query['column'] ) : $this->column;
+		$column = ( ! empty($query['column'])) ? esc_sql($query['column']) : $this->column;
 
-		$column = $this->validate_column( $column );
+		$column = $this->validate_column($column);
 
-		$compare = $this->get_compare( $query );
+		$compare = $this->get_compare($query);
 
-		$inclusive = ! empty( $query['inclusive'] );
+		$inclusive = ! empty($query['inclusive']);
 
 		// Assign greater- and less-than values.
 		$lt = '<';
 		$gt = '>';
 
-		if ( $inclusive ) {
+		if ($inclusive) {
 			$lt .= '=';
 			$gt .= '=';
 		}
 
 		// Range queries.
-		if ( ! empty( $query['after'] ) ) {
-			$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		if ( ! empty($query['after'])) {
+			$where_parts[] = $wpdb->prepare("$column $gt %s", $this->build_mysql_datetime($query['after'], ! $inclusive));
 		}
-		if ( ! empty( $query['before'] ) ) {
-			$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		if ( ! empty($query['before'])) {
+			$where_parts[] = $wpdb->prepare("$column $lt %s", $this->build_mysql_datetime($query['before'], $inclusive));
 		}
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
+		if (isset($query['year']) && $value = $this->build_value($compare, $query['year']))
 			$where_parts[] = "YEAR( $column ) $compare $value";
 
-		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
+		if (isset($query['month']) && $value = $this->build_value($compare, $query['month'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
-		} elseif ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) ) {
+		} elseif (isset($query['monthnum']) && $value = $this->build_value($compare, $query['monthnum'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
 		}
-		if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
+		if (isset($query['week']) && false !== ($value = $this->build_value($compare, $query['week']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
+		} elseif (isset($query['w']) && false !== ($value = $this->build_value($compare, $query['w']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
+		if (isset($query['dayofyear']) && $value = $this->build_value($compare, $query['dayofyear']))
 			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
+		if (isset($query['day']) && $value = $this->build_value($compare, $query['day']))
 			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
+		if (isset($query['dayofweek']) && $value = $this->build_value($compare, $query['dayofweek']))
 			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
+		if (isset($query['dayofweek_iso']) && $value = $this->build_value($compare, $query['dayofweek_iso']))
 			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
 
-		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
+		if (isset($query['hour']) || isset($query['minute']) || isset($query['second'])) {
 			// Avoid notices.
-			foreach ( array( 'hour', 'minute', 'second' ) as $unit ) {
-				if ( ! isset( $query[ $unit ] ) ) {
-					$query[ $unit ] = null;
+			foreach (array('hour', 'minute', 'second') as $unit) {
+				if ( ! isset($query[$unit])) {
+					$query[$unit] = null;
 				}
 			}
 
-			if ( $time_query = $this->build_time_query( $column, $compare, $query['hour'], $query['minute'], $query['second'] ) ) {
+			if ($time_query = $this->build_time_query($column, $compare, $query['hour'], $query['minute'], $query['second'])) {
 				$where_parts[] = $time_query;
 			}
 		}
@@ -808,45 +808,45 @@ 
 	 * @param string|array $value The value
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
-	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
+	public function build_value($compare, $value) {
+		if ( ! isset($value))
 			return false;
 
-		switch ( $compare ) {
+		switch ($compare) {
 			case 'IN':
 			case 'NOT IN':
 				$value = (array) $value;
 
 				// Remove non-numeric values.
-				$value = array_filter( $value, 'is_numeric' );
+				$value = array_filter($value, 'is_numeric');
 
-				if ( empty( $value ) ) {
+				if (empty($value)) {
 					return false;
 				}
 
-				return '(' . implode( ',', array_map( 'intval', $value ) ) . ')';
+				return '('.implode(',', array_map('intval', $value)).')';
 
 			case 'BETWEEN':
 			case 'NOT BETWEEN':
-				if ( ! is_array( $value ) || 2 != count( $value ) ) {
-					$value = array( $value, $value );
+				if ( ! is_array($value) || 2 != count($value)) {
+					$value = array($value, $value);
 				} else {
-					$value = array_values( $value );
+					$value = array_values($value);
 				}
 
 				// If either value is non-numeric, bail.
-				foreach ( $value as $v ) {
-					if ( ! is_numeric( $v ) ) {
+				foreach ($value as $v) {
+					if ( ! is_numeric($v)) {
 						return false;
 					}
 				}
 
-				$value = array_map( 'intval', $value );
+				$value = array_map('intval', $value);
 
-				return $value[0] . ' AND ' . $value[1];
+				return $value[0].' AND '.$value[1];
 
 			default;
-				if ( ! is_numeric( $value ) ) {
+				if ( ! is_numeric($value)) {
 					return false;
 				}
 
@@ -871,75 +871,75 @@ 
 	 *                                     Default: false.
 	 * @return string|false A MySQL format date/time or false on failure
 	 */
-	public function build_mysql_datetime( $datetime, $default_to_max = false ) {
-		$now = current_time( 'timestamp' );
+	public function build_mysql_datetime($datetime, $default_to_max = false) {
+		$now = current_time('timestamp');
 
-		if ( ! is_array( $datetime ) ) {
+		if ( ! is_array($datetime)) {
 
 			/*
 			 * Try to parse some common date formats, so we can detect
 			 * the level of precision and support the 'inclusive' parameter.
 			 */
-			if ( preg_match( '/^(\d{4})$/', $datetime, $matches ) ) {
+			if (preg_match('/^(\d{4})$/', $datetime, $matches)) {
 				// Y
 				$datetime = array(
-					'year' => intval( $matches[1] ),
+					'year' => intval($matches[1]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
-					'day'   => intval( $matches[3] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
+					'day'   => intval($matches[3]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d H:i
 				$datetime = array(
-					'year'   => intval( $matches[1] ),
-					'month'  => intval( $matches[2] ),
-					'day'    => intval( $matches[3] ),
-					'hour'   => intval( $matches[4] ),
-					'minute' => intval( $matches[5] ),
+					'year'   => intval($matches[1]),
+					'month'  => intval($matches[2]),
+					'day'    => intval($matches[3]),
+					'hour'   => intval($matches[4]),
+					'minute' => intval($matches[5]),
 				);
 			}
 
 			// If no match is found, we don't support default_to_max.
-			if ( ! is_array( $datetime ) ) {
+			if ( ! is_array($datetime)) {
 				// @todo Timezone issues here possibly
-				return gmdate( 'Y-m-d H:i:s', strtotime( $datetime, $now ) );
+				return gmdate('Y-m-d H:i:s', strtotime($datetime, $now));
 			}
 		}
 
-		$datetime = array_map( 'absint', $datetime );
+		$datetime = array_map('absint', $datetime);
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset($datetime['year']))
+			$datetime['year'] = gmdate('Y', $now);
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset($datetime['month']))
+			$datetime['month'] = ($default_to_max) ? 12 : 1;
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset($datetime['day']))
+			$datetime['day'] = ($default_to_max) ? (int) date('t', mktime(0, 0, 0, $datetime['month'], 1, $datetime['year'])) : 1;
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset($datetime['hour']))
+			$datetime['hour'] = ($default_to_max) ? 23 : 0;
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['minute']))
+			$datetime['minute'] = ($default_to_max) ? 59 : 0;
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['second']))
+			$datetime['second'] = ($default_to_max) ? 59 : 0;
 
-		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
+		return sprintf('%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second']);
 	}
 
 	/**
@@ -959,48 +959,48 @@ 
 	 * @param int|null $second Optional. A second value (0-59).
 	 * @return string|false A query part or false on failure.
 	 */
-	public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
+	public function build_time_query($column, $compare, $hour = null, $minute = null, $second = null) {
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
+		if ( ! isset($hour) && ! isset($minute) && ! isset($second))
 			return false;
 
 		// Complex combined queries aren't supported for multi-value queries
-		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+		if (in_array($compare, array('IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'))) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
+			if (isset($hour) && false !== ($value = $this->build_value($compare, $hour)))
 				$return[] = "HOUR( $column ) $compare $value";
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
+			if (isset($minute) && false !== ($value = $this->build_value($compare, $minute)))
 				$return[] = "MINUTE( $column ) $compare $value";
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
+			if (isset($second) && false !== ($value = $this->build_value($compare, $second)))
 				$return[] = "SECOND( $column ) $compare $value";
 
-			return implode( ' AND ', $return );
+			return implode(' AND ', $return);
 		}
 
 		// Cases where just one unit is set
-		if ( isset( $hour ) && ! isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+		if (isset($hour) && ! isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $hour))) {
 			return "HOUR( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+		} elseif ( ! isset($hour) && isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $minute))) {
 			return "MINUTE( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && ! isset( $minute ) && isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+		} elseif ( ! isset($hour) && ! isset($minute) && isset($second) && false !== ($value = $this->build_value($compare, $second))) {
 			return "SECOND( $column ) $compare $value";
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
+		if ( ! isset($minute))
 			return false;
 
 		$format = $time = '';
 
 		// Hour
-		if ( null !== $hour ) {
+		if (null !== $hour) {
 			$format .= '%H.';
-			$time   .= sprintf( '%02d', $hour ) . '.';
+			$time   .= sprintf('%02d', $hour).'.';
 		} else {
 			$format .= '0.';
 			$time   .= '0.';
@@ -1008,13 +1008,13 @@ 
 
 		// Minute
 		$format .= '%i';
-		$time   .= sprintf( '%02d', $minute );
+		$time   .= sprintf('%02d', $minute);
 
-		if ( isset( $second ) ) {
+		if (isset($second)) {
 			$format .= '%s';
-			$time   .= sprintf( '%02d', $second );
+			$time   .= sprintf('%02d', $second);
 		}
 
-		return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+		return $wpdb->prepare("DATE_FORMAT( $column, %s ) $compare %f", $format, $time);
 	}
 }

Braces +54 added lines, -36 removed lines

@@ -272,8 +272,9 @@ 
 	 * @return string The comparison operator.
 	 */
 	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+					return strtoupper( $query['compare'] );
+		}
 
 		return $this->compare;
 	}
@@ -750,8 +751,9 @@ 
 		}
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
-			$where_parts[] = "YEAR( $column ) $compare $value";
+		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) ) {
+					$where_parts[] = "YEAR( $column ) $compare $value";
+		}
 
 		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
@@ -763,17 +765,21 @@ 
 		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
 			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
-			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) ) {
+					$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		}
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
-			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) ) {
+					$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
-			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) ) {
+					$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
-			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) ) {
+					$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		}
 
 		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
 			// Avoid notices.
@@ -809,8 +815,9 @@ 
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
-			return false;
+		if ( ! isset( $value ) ) {
+					return false;
+		}
 
 		switch ( $compare ) {
 			case 'IN':
@@ -921,23 +928,29 @@ 
 
 		$datetime = array_map( 'absint', $datetime );
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset( $datetime['year'] ) ) {
+					$datetime['year'] = gmdate( 'Y', $now );
+		}
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset( $datetime['month'] ) ) {
+					$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		}
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset( $datetime['day'] ) ) {
+					$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		}
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset( $datetime['hour'] ) ) {
+					$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		}
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['minute'] ) ) {
+					$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		}
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['second'] ) ) {
+					$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		}
 
 		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
 	}
@@ -963,21 +976,25 @@ 
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
-			return false;
+		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {
+					return false;
+		}
 
 		// Complex combined queries aren't supported for multi-value queries
 		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
-				$return[] = "HOUR( $column ) $compare $value";
+			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+							$return[] = "HOUR( $column ) $compare $value";
+			}
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
-				$return[] = "MINUTE( $column ) $compare $value";
+			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+							$return[] = "MINUTE( $column ) $compare $value";
+			}
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
-				$return[] = "SECOND( $column ) $compare $value";
+			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+							$return[] = "SECOND( $column ) $compare $value";
+			}
 
 			return implode( ' AND ', $return );
 		}
@@ -992,8 +1009,9 @@ 
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
-			return false;
+		if ( ! isset( $minute ) ) {
+					return false;
+		}
 
 		$format = $time = '';
 

src/wp-includes/deprecated.php

Doc Comments +4 added lines, -5 removed lines

@@ -610,7 +610,7 @@ 
  * @param string $feed_image
  * @param string $exclude
  * @param bool $hierarchical
- * @return false|null
+ * @return false|string
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
 				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
@@ -630,7 +630,7 @@ 
  * @see wp_list_categories()
  *
  * @param string|array $args
- * @return false|null|string
+ * @return false|string
  */
 function wp_list_cats($args = '') {
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
@@ -2101,7 +2101,6 @@ 
  * @param string|int $name            Widget ID.
  * @param callable   $output_callback Run when widget is called.
  * @param string     $classname       Optional. Classname widget option. Default empty.
- * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
@@ -2419,7 +2418,7 @@ 
  * @see count_user_posts()
  *
  * @param int $userid User to count posts for.
- * @return int Number of posts the given user has written.
+ * @return string Number of posts the given user has written.
  */
 function get_usernumposts( $userid ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'count_user_posts()' );
@@ -3601,7 +3600,7 @@ 
  * @deprecated 4.4.0 Use get_permalink()
  * @see get_permalink()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
 function post_permalink( $post_id = 0 ) {

Spacing +548 added lines, -548 removed lines

@@ -23,11 +23,11 @@ 
  * @return array Post data.
  */
 function get_postdata($postid) {
-	_deprecated_function( __FUNCTION__, '1.5.1', 'get_post()' );
+	_deprecated_function(__FUNCTION__, '1.5.1', 'get_post()');
 
 	$post = get_post($postid);
 
-	$postdata = array (
+	$postdata = array(
 		'ID' => $post->ID,
 		'Author_ID' => $post->post_author,
 		'Date' => $post->post_date,
@@ -61,12 +61,12 @@ 
 function start_wp() {
 	global $wp_query;
 
-	_deprecated_function( __FUNCTION__, '1.5.0', __('new WordPress Loop') );
+	_deprecated_function(__FUNCTION__, '1.5.0', __('new WordPress Loop'));
 
 	// Since the old style loop is being used, advance the query iterator here.
 	$wp_query->next_post();
 
-	setup_postdata( get_post() );
+	setup_postdata(get_post());
 }
 
 /**
@@ -80,13 +80,13 @@ 
  * @return int Category ID.
  */
 function the_category_ID($echo = true) {
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
+	if ($echo)
 		echo $cat;
 
 	return $cat;
@@ -102,15 +102,15 @@ 
  * @param string $before Optional. Text to display before the category. Default empty.
  * @param string $after  Optional. Text to display after the category. Default empty.
  */
-function the_category_head( $before = '', $after = '' ) {
+function the_category_head($before = '', $after = '') {
 	global $currentcat, $previouscat;
 
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category_by_ID()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category_by_ID()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$currentcat = $categories[0]->category_id;
-	if ( $currentcat != $previouscat ) {
+	if ($currentcat != $previouscat) {
 		echo $before;
 		echo get_the_category_by_ID($currentcat);
 		echo $after;
@@ -132,22 +132,22 @@ 
  * @param int    $limitprev
  * @param string $excluded_categories
  */
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
+function previous_post($format = '%', $previous = 'previous post: ', $title = 'yes', $in_same_cat = 'no', $limitprev = 1, $excluded_categories = '') {
 
-	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'previous_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -168,21 +168,21 @@ 
  * @param int $limitnext
  * @param string $excluded_categories
  */
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
+function next_post($format = '%', $next = 'next post: ', $title = 'yes', $in_same_cat = 'no', $limitnext = 1, $excluded_categories = '') {
+	_deprecated_function(__FUNCTION__, '2.0.0', 'next_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -202,7 +202,7 @@ 
  * @return bool
  */
 function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level > 1);
@@ -221,7 +221,7 @@ 
  * @return bool
  */
 function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level >= 1);
@@ -240,15 +240,15 @@ 
  * @return bool
  */
 function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	$post = get_post($post_id);
 	$post_author_data = get_userdata($post->post_author);
 
-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
+	if ((($user_id == $post_author_data->ID) && ! ($post->post_status == 'publish' && $author_data->user_level < 2))
 			 || ($author_data->user_level > $post_author_data->user_level)
-			 || ($author_data->user_level >= 10) ) {
+			 || ($author_data->user_level >= 10)) {
 		return true;
 	} else {
 		return false;
@@ -268,7 +268,7 @@ 
  * @return bool
  */
 function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit, one can delete
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -287,7 +287,7 @@ 
  * @return bool
  */
 function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
@@ -306,7 +306,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's date
  */
 function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
@@ -325,7 +325,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's comments
  */
 function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit a post, one can edit comments made on it
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -344,7 +344,7 @@ 
  * @return bool returns true if $user_id can delete $post_id's comments
  */
 function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit comments, one can delete comments
 	return user_can_edit_post_comments($user_id, $post_id, $blog_id);
@@ -362,11 +362,11 @@ 
  * @return bool
  */
 function user_can_edit_user($user_id, $other_user) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+	if ($user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID)
 		return true;
 	else
 		return false;
@@ -395,11 +395,11 @@ 
 function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
 						 $show_description = true, $show_rating = false,
 						 $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
@@ -430,7 +430,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -454,12 +454,12 @@ 
  * @param int $limit Limit to X entries. If not specified, all entries are shown.
  * @return array
  */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+function get_linkobjectsbyname($cat_name = "noname", $orderby = 'name', $limit = -1) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	return get_linkobjects($cat_id, $orderby, $limit);
@@ -506,9 +506,9 @@ 
  * @return array
  */
 function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
-	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
+	$links = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'limit' => $limit));
 
 	$links_array = array();
 	foreach ($links as $link)
@@ -539,7 +539,7 @@ 
  */
 function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
 									$show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -566,7 +566,7 @@ 
  */
 function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
 							  $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -581,7 +581,7 @@ 
  * @return int Only returns 0.
  */
 function get_autotoggle($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0' );
+	_deprecated_function(__FUNCTION__, '2.1.0');
 	return 0;
 }
 
@@ -613,9 +613,9 @@ 
  * @return false|null
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
-				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
-				   $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=false) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
+				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children = false, $child_of = 0, $categories = 0,
+				   $recurse = 0, $feed = '', $feed_image = '', $exclude = '', $hierarchical = false) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_categories()');
 
 	$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
 		'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -633,22 +633,22 @@ 
  * @return false|null|string
  */
 function wp_list_cats($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_categories()');
 
-	$r = wp_parse_args( $args );
+	$r = wp_parse_args($args);
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
+	if (isset($r['optionall']) && isset($r['all']))
 		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
+	if (isset($r['sort_column']))
 		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
+	if (isset($r['sort_order']))
 		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
+	if (isset($r['optiondates']))
 		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
+	if (isset($r['optioncount']))
 		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
+	if (isset($r['list']))
 		$r['style'] = $r['list'] ? 'list' : 'break';
 	$r['title_li'] = '';
 
@@ -677,14 +677,14 @@ 
 function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',
 		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = false,
 		$selected = 0, $exclude = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_dropdown_categories()');
 
 	$show_option_all = '';
-	if ( $optionall )
+	if ($optionall)
 		$show_option_all = $all;
 
 	$show_option_none = '';
-	if ( $optionnone )
+	if ($optionnone)
 		$show_option_none = __('None');
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
@@ -709,7 +709,7 @@ 
  * @return null|string
  */
 function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_authors()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_authors()');
 
 	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');
 	return wp_list_authors($args);
@@ -727,7 +727,7 @@ 
  * @return array
  */
 function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_get_post_categories()');
 	return wp_get_post_categories($post_ID);
 }
 
@@ -745,7 +745,7 @@ 
  * @return bool|mixed
  */
 function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_set_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_set_post_categories()');
 	return wp_set_post_categories($post_ID, $post_categories);
 }
 
@@ -764,8 +764,8 @@ 
  * @param bool $show_post_count
  * @return string|null
  */
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_archives()' );
+function get_archives($type = '', $limit = '', $format = 'html', $before = '', $after = '', $show_post_count = false) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_get_archives()');
 	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
 	return wp_get_archives($args);
 }
@@ -783,11 +783,11 @@ 
  * @return string|null
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_author_posts_url()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_author_posts_url()');
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -808,9 +808,9 @@ 
  * @param string $more_file
  * @return string
  */
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page',
-					$pagelink='%', $more_file='') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_link_pages()' );
+function link_pages($before = '<br />', $after = '<br />', $next_or_number = 'number', $nextpagelink = 'next page', $previouspagelink = 'previous page',
+					$pagelink = '%', $more_file = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_link_pages()');
 
 	$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
 	return wp_link_pages($args);
@@ -827,7 +827,7 @@ 
  * @return string
  */
 function get_settings($option) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_option()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_option()');
 
 	return get_option($option);
 }
@@ -840,7 +840,7 @@ 
  * @see the_permalink()
  */
 function permalink_link() {
-	_deprecated_function( __FUNCTION__, '1.2.0', 'the_permalink()' );
+	_deprecated_function(__FUNCTION__, '1.2.0', 'the_permalink()');
 	the_permalink();
 }
 
@@ -854,7 +854,7 @@ 
  * @param string $deprecated
  */
 function permalink_single_rss($deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.3.0', 'the_permalink_rss()' );
+	_deprecated_function(__FUNCTION__, '2.3.0', 'the_permalink_rss()');
 	the_permalink_rss();
 }
 
@@ -869,11 +869,11 @@ 
  * @return null|string
  */
 function wp_get_links($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()');
 
-	if ( strpos( $args, '=' ) === false ) {
+	if (strpos($args, '=') === false) {
 		$cat_id = $args;
-		$args = add_query_arg( 'category', $cat_id, $args );
+		$args = add_query_arg('category', $cat_id, $args);
 	}
 
 	$defaults = array(
@@ -892,7 +892,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -923,81 +923,81 @@ 
  */
 function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
 			$show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
+	if (substr($orderby, 0, 1) == '_') {
 		$order = 'DESC';
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ($category == -1) //get_bookmarks uses '' to signify all categories
 		$category = '';
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
+	if ( ! $results)
 		return;
 
 	$output = '';
 
-	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
+	foreach ((array) $results as $row) {
+		if ( ! isset($row->recently_updated))
 			$row->recently_updated = false;
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_prepend');
 		$the_link = '#';
-		if ( !empty($row->link_url) )
+		if ( ! empty($row->link_url))
 			$the_link = esc_url($row->link_url);
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ('' != $rel)
+			$rel = ' rel="'.$rel.'"';
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
+		if ($show_updated)
 			if (substr($row->link_updated_f, 0, 2) != '00')
-				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+				$title .= ' ('.__('Last updated').' '.date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)).')';
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ('' != $title)
+			$title = ' title="'.$title.'"';
 
-		$alt = ' alt="' . $name . '"';
+		$alt = ' alt="'.$name.'"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ('' != $target)
+			$target = ' target="'.$target.'"';
 
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
-		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
+		if ($row->link_image != null && $show_images) {
+			if (strpos($row->link_image, 'http') !== false)
 				$output .= "<img src=\"$row->link_image\" $alt $title />";
 			else // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$row->link_image\" $alt $title />";
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_append');
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ($show_description && '' != $desc)
+			$output .= $between.$desc;
 
 		if ($show_rating) {
-			$output .= $between . get_linkrating($row);
+			$output .= $between.get_linkrating($row);
 		}
 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
+	if ( ! $echo)
 		return $output;
 	echo $output;
 }
@@ -1015,29 +1015,29 @@ 
  * @param string $order Sort link categories by 'name' or 'id'
  */
 function get_links_list($order = 'name') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()');
 
 	$order = strtolower($order);
 
 	// Handle link category sorting
 	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
+	if ('_' == substr($order, 0, 1)) {
 		$direction = 'DESC';
-		$order = substr($order,1);
+		$order = substr($order, 1);
 	}
 
-	if ( !isset($direction) )
+	if ( ! isset($direction))
 		$direction = '';
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
 	// Display each category
-	if ( $cats ) {
-		foreach ( (array) $cats as $cat ) {
+	if ($cats) {
+		foreach ((array) $cats as $cat) {
 			// Handle each category.
 
 			// Display the category name
-			echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
+			echo '  <li id="linkcat-'.$cat->term_id.'" class="linkcat"><h2>'.apply_filters('link_category', $cat->name)."</h2>\n\t<ul>\n";
 			// Call get_links() with all the appropriate params
 			get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
 
@@ -1059,8 +1059,8 @@ 
  * @param string $file the page to open in the popup window
  * @param bool $count the number of links in the db
  */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-	_deprecated_function( __FUNCTION__, '2.1.0' );
+function links_popup_script($text = 'Links', $width = 400, $height = 400, $file = 'links.all.php', $count = true) {
+	_deprecated_function(__FUNCTION__, '2.1.0');
 }
 
 /**
@@ -1073,8 +1073,8 @@ 
  * @param object $link Link object.
  * @return mixed Value of the 'link_rating' field, false otherwise.
  */
-function get_linkrating( $link ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'sanitize_bookmark_field()' );
+function get_linkrating($link) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'sanitize_bookmark_field()');
 	return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
 }
 
@@ -1089,16 +1089,16 @@ 
  * @return string
  */
 function get_linkcatname($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_category()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_category()');
 
 	$id = (int) $id;
 
-	if ( empty($id) )
+	if (empty($id))
 		return '';
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
+	if (empty($cats) || ! is_array($cats))
 		return '';
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
@@ -1117,7 +1117,7 @@ 
  * @param string $link_text
  */
 function comments_rss_link($link_text = 'Comments RSS') {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'post_comments_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'post_comments_feed_link()');
 	post_comments_feed_link($link_text);
 }
 
@@ -1133,11 +1133,11 @@ 
  * @return string
  */
 function get_category_rss_link($echo = false, $cat_ID = 1) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'get_category_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'get_category_feed_link()');
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1154,10 +1154,10 @@ 
  * @return string
  */
 function get_author_rss_link($echo = false, $author_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'get_author_feed_link()');
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1172,8 +1172,8 @@ 
  * @return string
  */
 function comments_rss() {
-	_deprecated_function( __FUNCTION__, '2.2.0', 'get_post_comments_feed_link()' );
-	return esc_url( get_post_comments_feed_link() );
+	_deprecated_function(__FUNCTION__, '2.2.0', 'get_post_comments_feed_link()');
+	return esc_url(get_post_comments_feed_link());
 }
 
 /**
@@ -1189,7 +1189,7 @@ 
  * @return int The new user's ID.
  */
 function create_user($username, $password, $email) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'wp_create_user()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'wp_create_user()');
 	return wp_create_user($username, $password, $email);
 }
 
@@ -1199,7 +1199,7 @@ 
  * @deprecated 2.5.0
  */
 function gzip_compression() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 	return false;
 }
 
@@ -1215,8 +1215,8 @@ 
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
-	_deprecated_function( __FUNCTION__, '2.7.0', 'get_comment()' );
+function get_commentdata($comment_ID, $no_cache = 0, $include_unapproved = false) {
+	_deprecated_function(__FUNCTION__, '2.7.0', 'get_comment()');
 	return get_comment($comment_ID, ARRAY_A);
 }
 
@@ -1230,9 +1230,9 @@ 
  * @param int $cat_ID Category ID
  * @return string category name
  */
-function get_catname( $cat_ID ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_cat_name()' );
-	return get_cat_name( $cat_ID );
+function get_catname($cat_ID) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_cat_name()');
+	return get_cat_name($cat_ID);
 }
 
 /**
@@ -1248,25 +1248,25 @@ 
  * @param array $visited Optional. Category Term IDs that have already been added.
  * @return string
  */
-function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
+function get_category_children($id, $before = '/', $after = '', $visited = array()) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_term_children()');
+	if (0 == $id)
 		return '';
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
-	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
+	foreach ((array) $cat_ids as $cat_id) {
+		if ($cat_id == $id)
 			continue;
 
-		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
+		$category = get_category($cat_id);
+		if (is_wp_error($category))
 			return $category;
-		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
+		if ($category->parent == $id && ! in_array($category->term_id, $visited)) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
-			$chain .= get_category_children( $category->term_id, $before, $after );
+			$chain .= get_category_children($category->term_id, $before, $after);
 		}
 	}
 	return $chain;
@@ -1284,11 +1284,11 @@ 
  * @return object List of all of the category IDs.
  */
 function get_all_category_ids() {
-	_deprecated_function( __FUNCTION__, '4.0.0', 'get_terms()' );
+	_deprecated_function(__FUNCTION__, '4.0.0', 'get_terms()');
 
-	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
-		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
+	if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category')) {
+		$cat_ids = get_terms('category', array('fields' => 'ids', 'get' => 'all'));
+		wp_cache_add('all_category_ids', $cat_ids, 'category');
 	}
 
 	return $cat_ids;
@@ -1304,7 +1304,7 @@ 
  * @return string The author's description.
  */
 function get_the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'description\')');
 	return get_the_author_meta('description');
 }
 
@@ -1316,7 +1316,7 @@ 
  * @see the_author_meta()
  */
 function the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'description\')');
 	the_author_meta('description');
 }
 
@@ -1330,7 +1330,7 @@ 
  * @return string The author's login name (username).
  */
 function get_the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'login\')');
 	return get_the_author_meta('login');
 }
 
@@ -1342,7 +1342,7 @@ 
  * @see the_author_meta()
  */
 function the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'login\')');
 	the_author_meta('login');
 }
 
@@ -1356,7 +1356,7 @@ 
  * @return string The author's first name.
  */
 function get_the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'first_name\')');
 	return get_the_author_meta('first_name');
 }
 
@@ -1368,7 +1368,7 @@ 
  * @see the_author_meta()
  */
 function the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'first_name\')');
 	the_author_meta('first_name');
 }
 
@@ -1382,7 +1382,7 @@ 
  * @return string The author's last name.
  */
 function get_the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'last_name\')');
 	return get_the_author_meta('last_name');
 }
 
@@ -1394,7 +1394,7 @@ 
  * @see the_author_meta()
  */
 function the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'last_name\')');
 	the_author_meta('last_name');
 }
 
@@ -1408,7 +1408,7 @@ 
  * @return string The author's nickname.
  */
 function get_the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'nickname\')');
 	return get_the_author_meta('nickname');
 }
 
@@ -1420,7 +1420,7 @@ 
  * @see the_author_meta()
  */
 function the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'nickname\')');
 	the_author_meta('nickname');
 }
 
@@ -1434,7 +1434,7 @@ 
  * @return string The author's username.
  */
 function get_the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'email\')');
 	return get_the_author_meta('email');
 }
 
@@ -1446,7 +1446,7 @@ 
  * @see the_author_meta()
  */
 function the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'email\')');
 	the_author_meta('email');
 }
 
@@ -1460,7 +1460,7 @@ 
  * @return string The author's ICQ number.
  */
 function get_the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'icq\')');
 	return get_the_author_meta('icq');
 }
 
@@ -1472,7 +1472,7 @@ 
  * @see the_author_meta()
  */
 function the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'icq\')');
 	the_author_meta('icq');
 }
 
@@ -1486,7 +1486,7 @@ 
  * @return string The author's Yahoo! IM name.
  */
 function get_the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'yim\')');
 	return get_the_author_meta('yim');
 }
 
@@ -1498,7 +1498,7 @@ 
  * @see the_author_meta()
  */
 function the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'yim\')');
 	the_author_meta('yim');
 }
 
@@ -1512,7 +1512,7 @@ 
  * @return string The author's MSN address.
  */
 function get_the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'msn\')');
 	return get_the_author_meta('msn');
 }
 
@@ -1524,7 +1524,7 @@ 
  * @see the_author_meta()
  */
 function the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'msn\')');
 	the_author_meta('msn');
 }
 
@@ -1538,7 +1538,7 @@ 
  * @return string The author's AIM address.
  */
 function get_the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'aim\')');
 	return get_the_author_meta('aim');
 }
 
@@ -1550,7 +1550,7 @@ 
  * @see the_author_meta()
  */
 function the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'aim\')');
 	the_author_meta('aim');
 }
 
@@ -1564,8 +1564,8 @@ 
  * @param int $auth_id The ID of the author.
  * @return string The author's display name.
  */
-function get_author_name( $auth_id = false ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'display_name\')' );
+function get_author_name($auth_id = false) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'display_name\')');
 	return get_the_author_meta('display_name', $auth_id);
 }
 
@@ -1579,7 +1579,7 @@ 
  * @return string The URL to the author's page.
  */
 function get_the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'url\')');
 	return get_the_author_meta('url');
 }
 
@@ -1591,7 +1591,7 @@ 
  * @see the_author_meta()
  */
 function the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'url\')');
 	the_author_meta('url');
 }
 
@@ -1605,7 +1605,7 @@ 
  * @return string|int The author's ID.
  */
 function get_the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'ID\')');
 	return get_the_author_meta('ID');
 }
 
@@ -1617,7 +1617,7 @@ 
  * @see the_author_meta()
  */
 function the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'ID\')');
 	the_author_meta('ID');
 }
 
@@ -1649,23 +1649,23 @@ 
  * @param int $cut Optional. Amount of words to keep for the content.
  * @param int $encode_html Optional. How to encode the content.
  */
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-	_deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' );
+function the_content_rss($more_link_text = '(more...)', $stripteaser = 0, $more_file = '', $cut = 0, $encode_html = 0) {
+	_deprecated_function(__FUNCTION__, '2.9.0', 'the_content_feed');
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
+	if ($cut && ! $encode_html)
 		$encode_html = 2;
-	if ( 1== $encode_html ) {
+	if (1 == $encode_html) {
 		$content = esc_html($content);
 		$cut = 0;
-	} elseif ( 0 == $encode_html ) {
+	} elseif (0 == $encode_html) {
 		$content = make_url_footnote($content);
-	} elseif ( 2 == $encode_html ) {
+	} elseif (2 == $encode_html) {
 		$content = strip_tags($content);
 	}
-	if ( $cut ) {
+	if ($cut) {
 		$blah = explode(' ', $content);
-		if ( count($blah) > $cut ) {
+		if (count($blah) > $cut) {
 			$k = $cut;
 			$use_dotdotdot = 1;
 		} else {
@@ -1674,7 +1674,7 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
+		for ($i = 0; $i < $k; $i++)
 			$excerpt .= $blah[$i].' ';
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
@@ -1695,20 +1695,20 @@ 
  * @param string $content Content to get links
  * @return string HTML stripped out of content with links at the bottom.
  */
-function make_url_footnote( $content ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '' );
-	preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
+function make_url_footnote($content) {
+	_deprecated_function(__FUNCTION__, '2.9.0', '');
+	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
 	$links_summary = "\n";
-	for ( $i = 0, $c = count( $matches[0] ); $i < $c; $i++ ) {
+	for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
 		$link_match = $matches[0][$i];
-		$link_number = '['.($i+1).']';
+		$link_number = '['.($i + 1).']';
 		$link_url = $matches[2][$i];
 		$link_text = $matches[4][$i];
-		$content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
-		$links_summary .= "\n" . $link_number . ' ' . $link_url;
+		$content = str_replace($link_match, $link_text.' '.$link_number, $content);
+		$link_url = ((strtolower(substr($link_url, 0, 7)) != 'http://') && (strtolower(substr($link_url, 0, 8)) != 'https://')) ? get_option('home').$link_url : $link_url;
+		$links_summary .= "\n".$link_number.' '.$link_url;
 	}
-	$content  = strip_tags( $content );
+	$content  = strip_tags($content);
 	$content .= $links_summary;
 	return $content;
 }
@@ -1734,9 +1734,9 @@ 
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _c( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function _c($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1751,9 +1751,9 @@ 
  * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function translate_with_context( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function translate_with_context($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1772,9 +1772,9 @@ 
  *                       Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _nc( $single, $plural, $number, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_nx()' );
-	return before_last_bar( _n( $single, $plural, $number, $domain ) );
+function _nc($single, $plural, $number, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_nx()');
+	return before_last_bar(_n($single, $plural, $number, $domain));
 }
 
 /**
@@ -1785,7 +1785,7 @@ 
  * @see _n()
  */
 function __ngettext() {
-	_deprecated_function( __FUNCTION__, '2.8.0', '_n()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', '_n()');
 	$args = func_get_args();
 	return call_user_func_array('_n', $args);
 }
@@ -1798,7 +1798,7 @@ 
  * @see _n_noop()
  */
 function __ngettext_noop() {
-	_deprecated_function( __FUNCTION__, '2.8.0', '_n_noop()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', '_n_noop()');
 	$args = func_get_args();
 	return call_user_func_array('_n_noop', $args);
 
@@ -1814,7 +1814,7 @@ 
  * @return array List of all options.
  */
 function get_alloptions() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_load_alloptions()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_load_alloptions()');
 	return wp_load_alloptions();
 }
 
@@ -1832,14 +1832,14 @@ 
  * @return string
  */
 function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_link()');
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
+	if (('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
 		return __('Missing Attachment');
 
-	if ( $permalink )
+	if ($permalink)
 		$url = get_attachment_link($_post->ID);
 
 	$post_title = esc_attr($_post->post_title);
@@ -1859,31 +1859,31 @@ 
  * @param bool $fullsize Optional, default to false. Whether to have full image.
  * @return array Icon URL and full path to file, respectively.
  */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
+function get_attachment_icon_src($id = 0, $fullsize = false) {
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
+	if ( ! $fullsize && $src = wp_get_attachment_thumb_url($post->ID)) {
 		// We have a thumbnail desired, specified and existing
 
 		$src_file = basename($src);
-	} elseif ( wp_attachment_is_image( $post->ID ) ) {
+	} elseif (wp_attachment_is_image($post->ID)) {
 		// We have an image without a thumbnail
 
-		$src = wp_get_attachment_url( $post->ID );
+		$src = wp_get_attachment_url($post->ID);
 		$src_file = & $file;
-	} elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
+	} elseif ($src = wp_mime_type_icon($post->ID)) {
 		// No thumb, no image. We'll look for a mime-related icon instead.
 
-		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-		$src_file = $icon_dir . '/' . basename($src);
+		$icon_dir = apply_filters('icon_dir', get_template_directory().'/images');
+		$src_file = $icon_dir.'/'.basename($src);
 	}
 
-	if ( !isset($src) || !$src )
+	if ( ! isset($src) || ! $src)
 		return false;
 
 	return array($src, $src_file);
@@ -1901,27 +1901,27 @@ 
  * @param array $max_dims Optional. Dimensions of image.
  * @return false|string HTML content.
  */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
+function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) {
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
+	if ( ! $src = get_attachment_icon_src($post->ID, $fullsize))
 		return false;
 
 	list($src, $src_file) = $src;
 
 	// Do we need to constrain the image?
-	if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+	if (($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file)) {
 
 		$imagesize = getimagesize($src_file);
 
-		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1]) {
 			$actual_aspect = $imagesize[0] / $imagesize[1];
 			$desired_aspect = $max_dims[0] / $max_dims[1];
 
-			if ( $actual_aspect >= $desired_aspect ) {
+			if ($actual_aspect >= $desired_aspect) {
 				$height = $actual_aspect * $max_dims[0];
 				$constraint = "width='{$max_dims[0]}' ";
 				$post->iconsize = array($max_dims[0], $height);
@@ -1942,7 +1942,7 @@ 
 
 	$icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
 
-	return apply_filters( 'attachment_icon', $icon, $post->ID );
+	return apply_filters('attachment_icon', $icon, $post->ID);
 }
 
 /**
@@ -1958,12 +1958,12 @@ 
  * @return false|string
  */
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
+	if ($innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
 		return $innerHTML;
 
 	$innerHTML = esc_attr($post->post_title);
@@ -1985,8 +1985,8 @@ 
  *                            'attribute', 'js', 'db', or 'display'. Default 'raw'.
  * @return object|array Bookmark object or array, depending on the type specified by `$output`.
  */
-function get_link( $bookmark_id, $output = OBJECT, $filter = 'raw' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmark()' );
+function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmark()');
 	return get_bookmark($bookmark_id, $output, $filter);
 }
 
@@ -2001,9 +2001,9 @@ 
  * @param array $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function sanitize_url( $url, $protocols = null ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_url_raw()' );
-	return esc_url_raw( $url, $protocols );
+function sanitize_url($url, $protocols = null) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_url_raw()');
+	return esc_url_raw($url, $protocols);
 }
 
 /**
@@ -2022,12 +2022,12 @@ 
  * @param string $context Optional. How the URL will be used. Default is 'display'.
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
-function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+function clean_url($url, $protocols = null, $context = 'display') {
+	if ($context == 'db')
+		_deprecated_function('clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()');
 	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
-	return esc_url( $url, $protocols, $context );
+		_deprecated_function(__FUNCTION__, '3.0.0', 'esc_url()');
+	return esc_url($url, $protocols, $context);
 }
 
 /**
@@ -2042,9 +2042,9 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function js_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_js()' );
-	return esc_js( $text );
+function js_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_js()');
+	return esc_js($text);
 }
 
 /**
@@ -2059,13 +2059,13 @@ 
  * @param false        $double_encode Whether to double encode. Unused.
  * @return string Escaped `$string`.
  */
-function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_html()' );
-	if ( func_num_args() > 1 ) { // Maintain back-compat for people passing additional arguments.
+function wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_html()');
+	if (func_num_args() > 1) { // Maintain back-compat for people passing additional arguments.
 		$args = func_get_args();
-		return call_user_func_array( '_wp_specialchars', $args );
+		return call_user_func_array('_wp_specialchars', $args);
 	} else {
-		return esc_html( $string );
+		return esc_html($string);
 	}
 }
 
@@ -2079,9 +2079,9 @@ 
  * @param string $text
  * @return string
  */
-function attribute_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_attr()' );
-	return esc_attr( $text );
+function attribute_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_attr()');
+	return esc_attr($text);
 }
 
 /**
@@ -2104,10 +2104,10 @@ 
  * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2115,11 +2115,11 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
+	if ( ! empty($classname) && is_string($classname))
 		$options['classname'] = $classname;
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
@@ -2135,7 +2135,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_sidebar_widget($id) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_unregister_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_unregister_sidebar_widget()');
 	return wp_unregister_sidebar_widget($id);
 }
 
@@ -2159,10 +2159,10 @@ 
  * @param int $height Widget height.
  */
 function register_widget_control($name, $control_callback, $width = '', $height = '') {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_register_widget_control()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2170,13 +2170,13 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
+	if ( ! empty($width))
 		$options['width'] = $width;
-	if ( !empty($height) )
+	if ( ! empty($height))
 		$options['height'] = $height;
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_widget_control', $args);
@@ -2192,7 +2192,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_widget_control($id) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_unregister_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_unregister_widget_control()');
 	return wp_unregister_widget_control($id);
 }
 
@@ -2208,32 +2208,32 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True deletion completed and false if user_id is not a number.
  */
-function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
+function delete_usermeta($user_id, $meta_key, $meta_value = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'delete_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
+	if (is_array($meta_value) || is_object($meta_value))
 		$meta_value = serialize($meta_value);
-	$meta_value = trim( $meta_value );
+	$meta_value = trim($meta_value);
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	if ( ! empty($meta_value))
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value));
 	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2254,28 +2254,28 @@ 
  * @param string $meta_key Optional. Metadata key.
  * @return mixed
  */
-function get_usermeta( $user_id, $meta_key = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_user_meta()' );
+function get_usermeta($user_id, $meta_key = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_user_meta()');
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
+	if ( ! $user_id)
 		return false;
 
-	if ( !empty($meta_key) ) {
+	if ( ! empty($meta_key)) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
+		if (false !== $user && isset($user->$meta_key))
 			$metas = array($user->$meta_key);
 		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+			$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 	} else {
-		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
+		$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id));
 	}
 
-	if ( empty($metas) ) {
-		if ( empty($meta_key) )
+	if (empty($metas)) {
+		if (empty($meta_key))
 			return array();
 		else
 			return '';
@@ -2283,7 +2283,7 @@ 
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
+	if (count($metas) == 1)
 		return $metas[0];
 	else
 		return $metas;
@@ -2307,15 +2307,15 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True on successful update, false on failure.
  */
-function update_usermeta( $user_id, $meta_key, $meta_value ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
+function update_usermeta($user_id, $meta_key, $meta_value) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'update_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
+	if (is_string($meta_value))
 		$meta_value = stripslashes($meta_value);
 	$meta_value = maybe_serialize($meta_value);
 
@@ -2323,25 +2323,25 @@ 
 		return delete_usermeta($user_id, $meta_key);
 	}
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur)
+		do_action('update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	if ( ! $cur)
+		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value'));
+	elseif ($cur->meta_value != $meta_value)
+		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key'));
 	else
 		return false;
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	if ( ! $cur)
+		do_action('added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value);
 	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+		do_action('updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2361,15 +2361,15 @@ 
  * @param int $id Site ID.
  * @return array List of users that are part of that site ID
  */
-function get_users_of_blog( $id = '' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_users_of_blog($id = '') {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
-	if ( empty( $id ) ) {
+	if (empty($id)) {
 		$id = get_current_blog_id();
 	}
 	$blog_prefix = $wpdb->get_blog_prefix($id);
-	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+	$users = $wpdb->get_results("SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id");
 	return $users;
 }
 
@@ -2382,13 +2382,13 @@ 
  *
  * @param bool $add Optional, default is true. Add or remove links. Defaults to true.
  */
-function automatic_feed_links( $add = true ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
+function automatic_feed_links($add = true) {
+	_deprecated_function(__FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )");
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
+	if ($add)
+		add_theme_support('automatic-feed-links');
 	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+		remove_action('wp_head', 'feed_links_extra', 3); // Just do this yourself in 3.0+
 }
 
 /**
@@ -2402,13 +2402,13 @@ 
  * @param false|int $user Optional. User ID to retrieve the field for. Default false (current user).
  * @return string The author's field from the current author's DB object.
  */
-function get_profile( $field, $user = false ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_the_author_meta()' );
-	if ( $user ) {
-		$user = get_user_by( 'login', $user );
+function get_profile($field, $user = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_the_author_meta()');
+	if ($user) {
+		$user = get_user_by('login', $user);
 		$user = $user->ID;
 	}
-	return get_the_author_meta( $field, $user );
+	return get_the_author_meta($field, $user);
 }
 
 /**
@@ -2421,9 +2421,9 @@ 
  * @param int $userid User to count posts for.
  * @return int Number of posts the given user has written.
  */
-function get_usernumposts( $userid ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'count_user_posts()' );
-	return count_user_posts( $userid );
+function get_usernumposts($userid) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'count_user_posts()');
+	return count_user_posts($userid);
 }
 
 /**
@@ -2437,7 +2437,7 @@ 
  * @return string An HTML entity
  */
 function funky_javascript_callback($matches) {
-	return "&#".base_convert($matches[1],16,10).";";
+	return "&#".base_convert($matches[1], 16, 10).";";
 }
 
 /**
@@ -2455,12 +2455,12 @@ 
  * @return string Fixed text.
  */
 function funky_javascript_fix($text) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ($is_winIE || $is_macIE)
+		$text = preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
 
@@ -2477,9 +2477,9 @@ 
  * @param string $taxonomy Name of taxonomy object
  * @return bool Whether the taxonomy exists.
  */
-function is_taxonomy( $taxonomy ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'taxonomy_exists()' );
-	return taxonomy_exists( $taxonomy );
+function is_taxonomy($taxonomy) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'taxonomy_exists()');
+	return taxonomy_exists($taxonomy);
 }
 
 /**
@@ -2494,9 +2494,9 @@ 
  * @param int $parent ID of parent term under which to confine the exists search.
  * @return mixed Get the term id or Term Object, if exists.
  */
-function is_term( $term, $taxonomy = '', $parent = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'term_exists()' );
-	return term_exists( $term, $taxonomy, $parent );
+function is_term($term, $taxonomy = '', $parent = 0) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'term_exists()');
+	return term_exists($term, $taxonomy, $parent);
 }
 
 /**
@@ -2512,11 +2512,11 @@ 
  * @return bool
  */
 function is_plugin_page() {
-	_deprecated_function( __FUNCTION__, '3.1.0'  );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
+	if (isset($plugin_page))
 		return true;
 
 	return false;
@@ -2535,7 +2535,7 @@ 
  * @return bool Always return True
  */
 function update_category_cache() {
-	_deprecated_function( __FUNCTION__, '3.1.0'  );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return true;
 }
@@ -2549,7 +2549,7 @@ 
  * @return bool
  */
 function wp_timezone_supported() {
-	_deprecated_function( __FUNCTION__, '3.2.0' );
+	_deprecated_function(__FUNCTION__, '3.2.0');
 
 	return true;
 }
@@ -2569,9 +2569,9 @@ 
  * @param bool   $extended      Optional. Unused.
  */
 function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 
-	wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) );
+	wp_editor($content, $id, array('media_buttons' => $media_buttons));
 }
 
 /**
@@ -2584,20 +2584,20 @@ 
  * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
  */
 function get_user_metavalues($ids) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
+	foreach ($ids as $id)
 		$objects[$id] = array();
 
 	$metas = update_meta_cache('user', $ids);
 
-	foreach ( $metas as $id => $meta ) {
-		foreach ( $meta as $key => $metavalues ) {
-			foreach ( $metavalues as $value ) {
-				$objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
+	foreach ($metas as $id => $meta) {
+		foreach ($meta as $key => $metavalues) {
+			foreach ($metavalues as $value) {
+				$objects[$id][] = (object) array('user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
 			}
 		}
 	}
@@ -2618,23 +2618,23 @@ 
  * @return object|array The now sanitized User Object or Array (will be the same type as $user)
  */
 function sanitize_user_object($user, $context = 'display') {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
+	if (is_object($user)) {
+		if ( ! isset($user->ID))
 			$user->ID = 0;
-		if ( ! ( $user instanceof WP_User ) ) {
+		if ( ! ($user instanceof WP_User)) {
 			$vars = get_object_vars($user);
-			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
+			foreach (array_keys($vars) as $field) {
+				if (is_string($user->$field) || is_numeric($user->$field))
 					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
+		if ( ! isset($user['ID']))
 			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
+		foreach (array_keys($user) as $field)
 			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
 		$user['filter'] = $context;
 	}
@@ -2657,17 +2657,17 @@ 
  * @return string
  */
 function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
+	if (empty($posts))
 		return;
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
+	if (empty($post->post_title))
 		$post->post_title = $start ? __('First Post') : __('Last Post');
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2678,10 +2678,10 @@ 
 
 	$link = $start ? "<link rel='start' title='" : "<link rel='end' title='";
 	$link .= esc_attr($title);
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$boundary = $start ? 'start' : 'end';
-	return apply_filters( "{$boundary}_post_rel_link", $link );
+	return apply_filters("{$boundary}_post_rel_link", $link);
 }
 
 /**
@@ -2695,7 +2695,7 @@ 
  * @param string $excluded_categories Optional. Excluded categories IDs.
  */
 function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true);
 }
@@ -2709,10 +2709,10 @@ 
  * @return string
  */
 function get_index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	$link = "<link rel='index' title='" . esc_attr( get_bloginfo( 'name', 'display' ) ) . "' href='" . esc_url( user_trailingslashit( get_bloginfo( 'url', 'display' ) ) ) . "' />\n";
-	return apply_filters( "index_rel_link", $link );
+	$link = "<link rel='index' title='".esc_attr(get_bloginfo('name', 'display'))."' href='".esc_url(user_trailingslashit(get_bloginfo('url', 'display')))."' />\n";
+	return apply_filters("index_rel_link", $link);
 }
 
 /**
@@ -2722,7 +2722,7 @@ 
  * @deprecated 3.3.0
  */
 function index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_index_rel_link();
 }
@@ -2736,13 +2736,13 @@ 
  * @param string $title Optional. Link title format. Default '%title'.
  * @return string
  */
-function get_parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function get_parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
+	if ( ! empty($GLOBALS['post']) && ! empty($GLOBALS['post']->post_parent))
 		$post = get_post($GLOBALS['post']->post_parent);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2752,10 +2752,10 @@ 
 	$title = apply_filters('the_title', $title, $post->ID);
 
 	$link = "<link rel='up' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
-	return apply_filters( "parent_post_rel_link", $link );
+	return apply_filters("parent_post_rel_link", $link);
 }
 
 /**
@@ -2766,8 +2766,8 @@ 
  *
  * @param string $title Optional. Link title format. Default '%title'.
  */
-function parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_parent_post_rel_link($title);
 }
@@ -2780,18 +2780,18 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
  */
-function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function wp_admin_bar_dashboard_view_site_menu($wp_admin_bar) {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$user_id = get_current_user_id();
 
-	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+	if (0 != $user_id) {
+		if (is_admin())
+			$wp_admin_bar->add_menu(array('id' => 'view-site', 'title' => __('Visit Site'), 'href' => home_url()));
+		elseif (is_multisite())
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => get_dashboard_url($user_id)));
 		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => admin_url()));
 	}
 }
 
@@ -2805,10 +2805,10 @@ 
  * @param int $blog_id Site ID
  * @return bool True if the current users belong to $blog_id, false if not.
  */
-function is_blog_user( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'is_user_member_of_blog()' );
+function is_blog_user($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'is_user_member_of_blog()');
 
-	return is_user_member_of_blog( get_current_user_id(), $blog_id );
+	return is_user_member_of_blog(get_current_user_id(), $blog_id);
 }
 
 /**
@@ -2824,8 +2824,8 @@ 
  * @param string $mode     Type of access you required to the stream.
  * @return false Always false.
  */
-function debug_fopen( $filename, $mode ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fopen($filename, $mode) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 	return false;
 }
 
@@ -2841,10 +2841,10 @@ 
  * @param mixed  $fp     Unused.
  * @param string $string Message to log.
  */
-function debug_fwrite( $fp, $string ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
+function debug_fwrite($fp, $string) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
+	if ( ! empty($GLOBALS['debug']))
+		error_log($string);
 }
 
 /**
@@ -2858,8 +2858,8 @@ 
  *
  * @param mixed $fp Unused.
  */
-function debug_fclose( $fp ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fclose($fp) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 }
 
 /**
@@ -2876,21 +2876,21 @@ 
  * @return array Theme list with theme data.
  */
 function get_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_themes()');
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
+	if (isset($wp_themes))
 		return $wp_themes;
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		if (isset($wp_themes[$name]))
+			$wp_themes[$name.'/'.$theme->get_stylesheet()] = $theme;
 		else
-			$wp_themes[ $name ] = $theme;
+			$wp_themes[$name] = $theme;
 	}
 
 	return $wp_themes;
@@ -2906,12 +2906,12 @@ 
  * @param string $theme Theme name.
  * @return array|null Null, if theme name does not exist. Theme data, if exists.
  */
-function get_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
+function get_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )');
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if (is_array($themes) && array_key_exists($theme, $themes))
+		return $themes[$theme];
 	return null;
 }
 
@@ -2925,9 +2925,9 @@ 
  * @return string
  */
 function get_current_theme() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
 
-	if ( $theme = get_option( 'current_theme' ) )
+	if ($theme = get_option('current_theme'))
 		return $theme;
 
 	return wp_get_theme()->get('Name');
@@ -2946,10 +2946,10 @@ 
  * @return string The pre block without paragraph/line-break conversion.
  */
 function clean_pre($matches) {
-	_deprecated_function( __FUNCTION__, '3.4.0' );
+	_deprecated_function(__FUNCTION__, '3.4.0');
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
+	if (is_array($matches))
+		$text = $matches[1].$matches[2]."</pre>";
 	else
 		$text = $matches;
 
@@ -2972,15 +2972,15 @@ 
  * @param callable $admin_head_callback Call on custom header administration screen.
  * @param callable $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header( $wp_head_callback, $admin_head_callback, $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-header\', $args )' );
+function add_custom_image_header($wp_head_callback, $admin_head_callback, $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'add_theme_support( \'custom-header\', $args )');
 	$args = array(
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-header', $args );
+	return add_theme_support('custom-header', $args);
 }
 
 /**
@@ -2993,8 +2993,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_image_header() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-header\' )' );
-	return remove_theme_support( 'custom-header' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-header\' )');
+	return remove_theme_support('custom-header');
 }
 
 /**
@@ -3008,16 +3008,16 @@ 
  * @param callable $admin_head_callback Call on custom background administration screen.
  * @param callable $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
  */
-function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
+function add_custom_background($wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )');
 	$args = array();
-	if ( $wp_head_callback )
+	if ($wp_head_callback)
 		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
+	if ($admin_head_callback)
 		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-background', $args );
+	return add_theme_support('custom-background', $args);
 }
 
 /**
@@ -3030,8 +3030,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_background() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-background\' )' );
-	return remove_theme_support( 'custom-background' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-background\' )');
+	return remove_theme_support('custom-background');
 }
 
 /**
@@ -3044,9 +3044,9 @@ 
  * @param string $theme_file Theme file path.
  * @return array Theme data.
  */
-function get_theme_data( $theme_file ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
-	$theme = new WP_Theme( basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
+function get_theme_data($theme_file) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
+	$theme = new WP_Theme(basename(dirname($theme_file)), dirname(dirname($theme_file)));
 
 	$theme_data = array(
 		'Name' => $theme->get('Name'),
@@ -3062,9 +3062,9 @@ 
 		'AuthorName' => $theme->get('Author'),
 	);
 
-	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+	foreach (apply_filters('extra_theme_headers', array()) as $extra_header) {
+		if ( ! isset($theme_data[$extra_header]))
+			$theme_data[$extra_header] = $theme->get($extra_header);
 	}
 
 	return $theme_data;
@@ -3081,10 +3081,10 @@ 
  *
  * @param array $pages list of page objects
  */
-function update_page_cache( &$pages ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'update_post_cache()' );
+function update_page_cache(&$pages) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'update_post_cache()');
 
-	update_post_cache( $pages );
+	update_post_cache($pages);
 }
 
 /**
@@ -3099,10 +3099,10 @@ 
  *
  * @param int $id Page ID to clean
  */
-function clean_page_cache( $id ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'clean_post_cache()' );
+function clean_page_cache($id) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'clean_post_cache()');
 
-	clean_post_cache( $id );
+	clean_post_cache($id);
 }
 
 /**
@@ -3117,9 +3117,9 @@ 
  * @param string $action Nonce action.
  * @return string Are you sure message.
  */
-function wp_explain_nonce( $action ) {
-	_deprecated_function( __FUNCTION__, '3.4.1', 'wp_nonce_ays()' );
-	return __( 'Are you sure you want to do this?' );
+function wp_explain_nonce($action) {
+	_deprecated_function(__FUNCTION__, '3.4.1', 'wp_nonce_ays()');
+	return __('Are you sure you want to do this?');
 }
 
 /**
@@ -3131,9 +3131,9 @@ 
  *
  * @param int $post_id An optional post ID.
  */
-function sticky_class( $post_id = null ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
+function sticky_class($post_id = null) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'post_class()');
+	if (is_sticky($post_id))
 		echo ' sticky';
 }
 
@@ -3149,8 +3149,8 @@ 
  *
  * @param WP_Post &$post Post object, passed by reference (unused).
  */
-function _get_post_ancestors( &$post ) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+function _get_post_ancestors(&$post) {
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -3163,28 +3163,28 @@ 
  * @param string $file Filename of the image to load.
  * @return resource The resulting image resource on success, Error string on failure.
  */
-function wp_load_image( $file ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
+function wp_load_image($file) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_get_image_editor()');
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if (is_numeric($file))
+		$file = get_attached_file($file);
 
-	if ( ! is_file( $file ) ) {
+	if ( ! is_file($file)) {
 		/* translators: %s: file name */
-		return sprintf( __( 'File &#8220;%s&#8221; doesn&#8217;t exist?' ), $file );
+		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
 	}
 
-	if ( ! function_exists('imagecreatefromstring') )
+	if ( ! function_exists('imagecreatefromstring'))
 		return __('The GD image library is not installed.');
 
 	// Set artificially high because GD uses uncompressed images in memory.
-	wp_raise_memory_limit( 'image' );
+	wp_raise_memory_limit('image');
 
-	$image = imagecreatefromstring( file_get_contents( $file ) );
+	$image = imagecreatefromstring(file_get_contents($file));
 
-	if ( ! is_resource( $image ) ) {
+	if ( ! is_resource($image)) {
 		/* translators: %s: file name */
-		return sprintf( __( 'File &#8220;%s&#8221; is not an image.' ), $file );
+		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
 	}
 
 	return $image;
@@ -3214,22 +3214,22 @@ 
  * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
  * @return mixed WP_Error on failure. String with new destination path.
  */
-function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
+function image_resize($file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_get_image_editor()');
 
-	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($file);
+	if (is_wp_error($editor))
 		return $editor;
-	$editor->set_quality( $jpeg_quality );
+	$editor->set_quality($jpeg_quality);
 
-	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
+	$resized = $editor->resize($max_w, $max_h, $crop);
+	if (is_wp_error($resized))
 		return $resized;
 
-	$dest_file = $editor->generate_filename( $suffix, $dest_path );
-	$saved = $editor->save( $dest_file );
+	$dest_file = $editor->generate_filename($suffix, $dest_path);
+	$saved = $editor->save($dest_file);
 
-	if ( is_wp_error( $saved ) )
+	if (is_wp_error($saved))
 		return $saved;
 
 	return $dest_file;
@@ -3249,9 +3249,9 @@ 
  * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
  * @return WP_Post|null Post object or array holding post contents and information
  */
-function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
-	return get_post( $postid, $mode );
+function wp_get_single_post($postid = 0, $mode = OBJECT) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'get_post()');
+	return get_post($postid, $mode);
 }
 
 /**
@@ -3266,9 +3266,9 @@ 
  * @return bool False if does not authenticate, true if username and password authenticates.
  */
 function user_pass_ok($user_login, $user_pass) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
-	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_authenticate()');
+	$user = wp_authenticate($user_login, $user_pass);
+	if (is_wp_error($user))
 		return false;
 
 	return true;
@@ -3293,10 +3293,10 @@ 
  * @return bool
  */
 function gd_edit_image_support($mime_type) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_image_editor_supports()' );
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_image_editor_supports()');
 
-	if ( function_exists('imagetypes') ) {
-		switch( $mime_type ) {
+	if (function_exists('imagetypes')) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return (imagetypes() & IMG_JPG) != 0;
 			case 'image/png':
@@ -3305,7 +3305,7 @@ 
 				return (imagetypes() & IMG_GIF) != 0;
 		}
 	} else {
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return function_exists('imagecreatefromjpeg');
 			case 'image/png':
@@ -3327,22 +3327,22 @@ 
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
  */
-function wp_convert_bytes_to_hr( $bytes ) {
-	_deprecated_function( __FUNCTION__, '3.6.0', 'size_format()' );
+function wp_convert_bytes_to_hr($bytes) {
+	_deprecated_function(__FUNCTION__, '3.6.0', 'size_format()');
 
-	$units = array( 0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
-	$log   = log( $bytes, KB_IN_BYTES );
+	$units = array(0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB');
+	$log   = log($bytes, KB_IN_BYTES);
 	$power = (int) $log;
-	$size  = pow( KB_IN_BYTES, $log - $power );
+	$size  = pow(KB_IN_BYTES, $log - $power);
 
-	if ( ! is_nan( $size ) && array_key_exists( $power, $units ) ) {
-		$unit = $units[ $power ];
+	if ( ! is_nan($size) && array_key_exists($power, $units)) {
+		$unit = $units[$power];
 	} else {
 		$size = $bytes;
 		$unit = $units[0];
 	}
 
-	return $size . $unit;
+	return $size.$unit;
 }
 
 /**
@@ -3355,9 +3355,9 @@ 
  * @param string $t Search terms to "tidy", e.g. trim.
  * @return string Trimmed search terms.
  */
-function _search_terms_tidy( $t ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
-	return trim( $t, "\"'\n\r " );
+function _search_terms_tidy($t) {
+	_deprecated_function(__FUNCTION__, '3.7.0');
+	return trim($t, "\"'\n\r ");
 }
 
 /**
@@ -3373,10 +3373,10 @@ 
  */
 function rich_edit_exists() {
 	global $wp_rich_edit_exists;
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+	_deprecated_function(__FUNCTION__, '3.9.0');
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset($wp_rich_edit_exists))
+		$wp_rich_edit_exists = file_exists(ABSPATH.WPINC.'/js/tinymce/tinymce.js');
 
 	return $wp_rich_edit_exists;
 }
@@ -3391,7 +3391,7 @@ 
  * @param int $count Number of topics.
  * @return int Number of topics.
  */
-function default_topic_count_text( $count ) {
+function default_topic_count_text($count) {
 	return $count;
 }
 
@@ -3406,8 +3406,8 @@ 
  * @param string $content The text to format.
  * @return string The very same text.
  */
-function format_to_post( $content ) {
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+function format_to_post($content) {
+	_deprecated_function(__FUNCTION__, '3.9.0');
 	return $content;
 }
 
@@ -3422,8 +3422,8 @@ 
  * @return string text, safe for inclusion in LIKE query.
  */
 function like_escape($text) {
-	_deprecated_function( __FUNCTION__, '4.0.0', 'wpdb::esc_like()' );
-	return str_replace( array( "%", "_" ), array( "\\%", "\\_" ), $text );
+	_deprecated_function(__FUNCTION__, '4.0.0', 'wpdb::esc_like()');
+	return str_replace(array("%", "_"), array("\\%", "\\_"), $text);
 }
 
 /**
@@ -3438,14 +3438,14 @@ 
  * @param string $url The URL to test.
  * @return bool Whether SSL access is available.
  */
-function url_is_accessable_via_ssl( $url ) {
-	_deprecated_function( __FUNCTION__, '4.0.0' );
+function url_is_accessable_via_ssl($url) {
+	_deprecated_function(__FUNCTION__, '4.0.0');
 
-	$response = wp_remote_get( set_url_scheme( $url, 'https' ) );
+	$response = wp_remote_get(set_url_scheme($url, 'https'));
 
-	if ( !is_wp_error( $response ) ) {
-		$status = wp_remote_retrieve_response_code( $response );
-		if ( 200 == $status || 401 == $status ) {
+	if ( ! is_wp_error($response)) {
+		$status = wp_remote_retrieve_response_code($response);
+		if (200 == $status || 401 == $status) {
 			return true;
 		}
 	}
@@ -3463,7 +3463,7 @@ 
  * @deprecated 4.3.0
  */
 function preview_theme() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 }
 
 /**
@@ -3476,7 +3476,7 @@ 
  * @return string
  */
 function _preview_theme_template_filter() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3490,7 +3490,7 @@ 
  * @return string
  */
 function _preview_theme_stylesheet_filter() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3504,8 +3504,8 @@ 
  * @param string $content
  * @return string
  */
-function preview_theme_ob_filter( $content ) {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+function preview_theme_ob_filter($content) {
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return $content;
 }
 
@@ -3521,8 +3521,8 @@ 
  * @param array $matches
  * @return string
  */
-function preview_theme_ob_filter_callback( $matches ) {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+function preview_theme_ob_filter_callback($matches) {
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3539,9 +3539,9 @@ 
  * @return string The formatted text after filter is applied.
  */
 function wp_richedit_pre($text) {
-	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3.0', 'format_for_editor()');
 
-	if ( empty( $text ) ) {
+	if (empty($text)) {
 		/**
 		 * Filters text returned for the rich text editor.
 		 *
@@ -3557,15 +3557,15 @@ 
 		 *
 		 * @param string $output Text for the rich text editor.
 		 */
-		return apply_filters( 'richedit_pre', '' );
+		return apply_filters('richedit_pre', '');
 	}
 
 	$output = convert_chars($text);
 	$output = wpautop($output);
-	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset'));
 
 	/** This filter is documented in wp-includes/deprecated.php */
-	return apply_filters( 'richedit_pre', $output );
+	return apply_filters('richedit_pre', $output);
 }
 
 /**
@@ -3582,10 +3582,10 @@ 
  * @return string Formatted text after filter applied.
  */
 function wp_htmledit_pre($output) {
-	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3.0', 'format_for_editor()');
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( ! empty($output))
+		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset')); // convert only < > &
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3595,7 +3595,7 @@ 
 	 *
 	 * @param string $output The HTML-formatted text.
 	 */
-	return apply_filters( 'htmledit_pre', $output );
+	return apply_filters('htmledit_pre', $output);
 }
 
 /**
@@ -3608,10 +3608,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
-function post_permalink( $post_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'get_permalink()' );
+function post_permalink($post_id = 0) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'get_permalink()');
 
-	return get_permalink( $post_id );
+	return get_permalink($post_id);
 }
 
 /**
@@ -3630,44 +3630,44 @@ 
  *                               returns false. Default 1.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $red = 1 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'WP_Http' );
+function wp_get_http($url, $file_path = false, $red = 1) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'WP_Http');
 
-	@set_time_limit( 60 );
+	@set_time_limit(60);
 
-	if ( $red > 5 )
+	if ($red > 5)
 		return false;
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		$options['method'] = 'HEAD';
 	else
 		$options['method'] = 'GET';
 
-	$response = wp_safe_remote_request( $url, $options );
+	$response = wp_safe_remote_request($url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$headers = wp_remote_retrieve_headers( $response );
-	$headers['response'] = wp_remote_retrieve_response_code( $response );
+	$headers = wp_remote_retrieve_headers($response);
+	$headers['response'] = wp_remote_retrieve_response_code($response);
 
 	// WP_HTTP no longer follows redirects for HEAD requests.
-	if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
-		return wp_get_http( $headers['location'], $file_path, ++$red );
+	if ('HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset($headers['location'])) {
+		return wp_get_http($headers['location'], $file_path, ++$red);
 	}
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		return $headers;
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
+	if ( ! $out_fp)
 		return $headers;
 
-	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
+	fwrite($out_fp, wp_remote_retrieve_body($response));
 	fclose($out_fp);
 	clearstatcache();
 
@@ -3684,9 +3684,9 @@ 
  * @param string|bool $force Optional Whether to force SSL login. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_login( $force = null ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'force_ssl_admin()' );
-	return force_ssl_admin( $force );
+function force_ssl_login($force = null) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'force_ssl_admin()');
+	return force_ssl_admin($force);
 }
 
 /**
@@ -3698,7 +3698,7 @@ 
  * @return string Full path to comments popup template file.
  */
 function get_comments_popup_template() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 
 	return '';
 }
@@ -3712,7 +3712,7 @@ 
  * @return bool
  */
 function is_comments_popup() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 
 	return false;
 }
@@ -3724,7 +3724,7 @@ 
  * @deprecated 4.5.0
  */
 function comments_popup_script() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 }
 
 /**
@@ -3736,8 +3736,8 @@ 
  * @param string $text Content to replace links to open in a new window.
  * @return string Content that has filtered links.
  */
-function popuplinks( $text ) {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+function popuplinks($text) {
+	_deprecated_function(__FUNCTION__, '4.5.0');
 	$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
 	return $text;
 }
@@ -3753,8 +3753,8 @@ 
  *
  * @return string An empty string.
  */
-function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
-	_deprecated_function( __FUNCTION__, '4.6.0' );
+function wp_embed_handler_googlevideo($matches, $attr, $url, $rawattr) {
+	_deprecated_function(__FUNCTION__, '4.6.0');
 
 	return '';
 }
@@ -3768,9 +3768,9 @@ 
  * @return string Full path to paged template file.
  */
 function get_paged_template() {
-	_deprecated_function( __FUNCTION__, '4.7.0' );
+	_deprecated_function(__FUNCTION__, '4.7.0');
 
-	return get_query_template( 'paged' );
+	return get_query_template('paged');
 }
 
 /**
@@ -3793,10 +3793,10 @@ 
  * @param string $string
  * @return string
  */
-function wp_kses_js_entities( $string ) {
-	_deprecated_function( __FUNCTION__, '4.7.0' );
+function wp_kses_js_entities($string) {
+	_deprecated_function(__FUNCTION__, '4.7.0');
 
-	return preg_replace( '%&\s*\{[^}]*(\}\s*;?|$)%', '', $string );
+	return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
 }
 
 /**
@@ -3813,12 +3813,12 @@ 
  * @param object $b
  * @return int
  */
-function _usort_terms_by_ID( $a, $b ) {
-	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
+function _usort_terms_by_ID($a, $b) {
+	_deprecated_function(__FUNCTION__, '4.7.0', 'wp_list_sort');
 
-	if ( $a->term_id > $b->term_id )
+	if ($a->term_id > $b->term_id)
 		return 1;
-	elseif ( $a->term_id < $b->term_id )
+	elseif ($a->term_id < $b->term_id)
 		return -1;
 	else
 		return 0;
@@ -3838,10 +3838,10 @@ 
  * @param object $b
  * @return int
  */
-function _usort_terms_by_name( $a, $b ) {
-	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
+function _usort_terms_by_name($a, $b) {
+	_deprecated_function(__FUNCTION__, '4.7.0', 'wp_list_sort');
 
-	return strcmp( $a->name, $b->name );
+	return strcmp($a->name, $b->name);
 }
 
 /**
@@ -3857,24 +3857,24 @@ 
  * @param object $b The second object to compare
  * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b.
  */
-function _sort_nav_menu_items( $a, $b ) {
+function _sort_nav_menu_items($a, $b) {
 	global $_menu_item_sort_prop;
 
-	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
+	_deprecated_function(__FUNCTION__, '4.7.0', 'wp_list_sort');
 
-	if ( empty( $_menu_item_sort_prop ) )
+	if (empty($_menu_item_sort_prop))
 		return 0;
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
+	if ( ! isset($a->$_menu_item_sort_prop) || ! isset($b->$_menu_item_sort_prop))
 		return 0;
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
+	if ($a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop)
 		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
+	elseif ($_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop)
 		return $_a < $_b ? -1 : 1;
 	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+		return strcmp($a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop);
 }

Braces +401 added lines, -282 removed lines

@@ -86,8 +86,9 @@ 
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
-		echo $cat;
+	if ( $echo ) {
+			echo $cat;
+	}
 
 	return $cat;
 }
@@ -136,19 +137,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
-		return;
+	if ( !$post ) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -171,19 +175,22 @@ 
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
-		return;
+	if ( !$post	) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -366,11 +373,12 @@ 
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
+	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Gets the links associated with category $cat_name.
@@ -399,8 +407,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
 }
@@ -459,8 +468,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -511,8 +521,9 @@ 
 	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
 
 	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
+	foreach ($links as $link) {
+			$links_array[] = $link;
+	}
 
 	return $links_array;
 }
@@ -638,18 +649,24 @@ 
 	$r = wp_parse_args( $args );
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
-		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
-		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
-		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
-		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
-		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
-		$r['style'] = $r['list'] ? 'list' : 'break';
+	if ( isset($r['optionall']) && isset($r['all'])) {
+			$r['show_option_all'] = $r['all'];
+	}
+	if ( isset($r['sort_column']) ) {
+			$r['orderby'] = $r['sort_column'];
+	}
+	if ( isset($r['sort_order']) ) {
+			$r['order'] = $r['sort_order'];
+	}
+	if ( isset($r['optiondates']) ) {
+			$r['show_last_update'] = $r['optiondates'];
+	}
+	if ( isset($r['optioncount']) ) {
+			$r['show_count'] = $r['optioncount'];
+	}
+	if ( isset($r['list']) ) {
+			$r['style'] = $r['list'] ? 'list' : 'break';
+	}
 	$r['title_li'] = '';
 
 	return wp_list_categories($r);
@@ -680,12 +697,14 @@ 
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
 
 	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
+	if ( $optionall ) {
+			$show_option_all = $all;
+	}
 
 	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
+	if ( $optionnone ) {
+			$show_option_none = __('None');
+	}
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
@@ -787,8 +806,9 @@ 
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -931,64 +951,78 @@ 
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ( $category == -1 ) {
+		//get_bookmarks uses '' to signify all categories
 		$category = '';
+	}
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
-		return;
+	if ( !$results ) {
+			return;
+	}
 
 	$output = '';
 
 	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
+		if ( !isset($row->recently_updated) ) {
+					$row->recently_updated = false;
+		}
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_prepend');
+		}
 		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = esc_url($row->link_url);
+		if ( !empty($row->link_url) ) {
+					$the_link = esc_url($row->link_url);
+		}
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ( '' != $rel ) {
+					$rel = ' rel="' . $rel . '"';
+		}
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+		if ( $show_updated ) {
+					if (substr($row->link_updated_f, 0, 2) != '00')
 				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+		}
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ( '' != $title ) {
+					$title = ' title="' . $title . '"';
+		}
 
 		$alt = ' alt="' . $name . '"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ( '' != $target ) {
+					$target = ' target="' . $target . '"';
+		}
 
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path
+			if ( strpos($row->link_image, 'http') !== false ) {
+							$output .= "<img src=\"$row->link_image\" $alt $title />";
+			} else {
+				// If it's a relative path
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+			}
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_append');
+		}
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ( $show_description && '' != $desc ) {
+					$output .= $between . $desc;
+		}
 
 		if ($show_rating) {
 			$output .= $between . get_linkrating($row);
@@ -997,8 +1031,9 @@ 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
-		return $output;
+	if ( !$echo ) {
+			return $output;
+	}
 	echo $output;
 }
 
@@ -1026,8 +1061,9 @@ 
 		$order = substr($order,1);
 	}
 
-	if ( !isset($direction) )
-		$direction = '';
+	if ( !isset($direction) ) {
+			$direction = '';
+	}
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
@@ -1093,13 +1129,15 @@ 
 
 	$id = (int) $id;
 
-	if ( empty($id) )
-		return '';
+	if ( empty($id) ) {
+			return '';
+	}
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
+	if ( empty($cats) || ! is_array($cats) ) {
+			return '';
+	}
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
 
@@ -1137,8 +1175,9 @@ 
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1157,8 +1196,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1250,19 +1290,22 @@ 
  */
 function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
-		return '';
+	if ( 0 == $id ) {
+			return '';
+	}
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
 	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
-			continue;
+		if ( $cat_id == $id ) {
+					continue;
+		}
 
 		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
-			return $category;
+		if ( is_wp_error( $category ) ) {
+					return $category;
+		}
 		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
@@ -1653,8 +1696,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' );
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
-		$encode_html = 2;
+	if ( $cut && !$encode_html ) {
+			$encode_html = 2;
+	}
 	if ( 1== $encode_html ) {
 		$content = esc_html($content);
 		$cut = 0;
@@ -1674,8 +1718,9 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
-			$excerpt .= $blah[$i].' ';
+		for ( $i=0; $i<$k; $i++ ) {
+					$excerpt .= $blah[$i].' ';
+		}
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
 	}
@@ -1836,11 +1881,13 @@ 
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
+	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) {
+			return __('Missing Attachment');
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
+	if ( $permalink ) {
+			$url = get_attachment_link($_post->ID);
+	}
 
 	$post_title = esc_attr($_post->post_title);
 
@@ -1862,8 +1909,9 @@ 
 function get_attachment_icon_src( $id = 0, $fullsize = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -1883,8 +1931,9 @@ 
 		$src_file = $icon_dir . '/' . basename($src);
 	}
 
-	if ( !isset($src) || !$src )
-		return false;
+	if ( !isset($src) || !$src ) {
+			return false;
+	}
 
 	return array($src, $src_file);
 }
@@ -1904,11 +1953,13 @@ 
 function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
+	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) {
+			return false;
+	}
 
 	list($src, $src_file) = $src;
 
@@ -1960,11 +2011,13 @@ 
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
+	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) {
+			return $innerHTML;
+	}
 
 	$innerHTML = esc_attr($post->post_title);
 
@@ -2023,10 +2076,11 @@ 
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
 function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
-	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	if ( $context == 'db' ) {
+			_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+	} else {
+			_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	}
 	return esc_url( $url, $protocols, $context );
 }
 
@@ -2107,20 +2161,23 @@ 
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
-		$options['classname'] = $classname;
+	if ( !empty($classname) && is_string($classname) ) {
+			$options['classname'] = $classname;
+	}
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
 }
@@ -2162,22 +2219,26 @@ 
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
-		$options['width'] = $width;
-	if ( !empty($height) )
-		$options['height'] = $height;
+	if ( !empty($width) ) {
+			$options['width'] = $width;
+	}
+	if ( !empty($height) ) {
+			$options['height'] = $height;
+	}
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_widget_control', $args);
 }
@@ -2211,29 +2272,34 @@ 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
-		$meta_value = serialize($meta_value);
+	if ( is_array($meta_value) || is_object($meta_value) ) {
+			$meta_value = serialize($meta_value);
+	}
 	$meta_value = trim( $meta_value );
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
-	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	if ( ! empty($meta_value) ) {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	} else {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2259,35 +2325,39 @@ 
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
-		return false;
+	if ( !$user_id ) {
+			return false;
+	}
 
 	if ( !empty($meta_key) ) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
-			$metas = array($user->$meta_key);
-		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		if ( false !== $user && isset($user->$meta_key) ) {
+					$metas = array($user->$meta_key);
+		} else {
+					$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		}
 	} else {
 		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
 	}
 
 	if ( empty($metas) ) {
-		if ( empty($meta_key) )
-			return array();
-		else
-			return '';
+		if ( empty($meta_key) ) {
+					return array();
+		} else {
+					return '';
+		}
 	}
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
-		return $metas[0];
-	else
-		return $metas;
-}
+	if ( count($metas) == 1 ) {
+			return $metas[0];
+	} else {
+			return $metas;
+	}
+	}
 
 /**
  * Update metadata of user.
@@ -2310,13 +2380,15 @@ 
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
-		$meta_value = stripslashes($meta_value);
+	if ( is_string($meta_value) ) {
+			$meta_value = stripslashes($meta_value);
+	}
 	$meta_value = maybe_serialize($meta_value);
 
 	if (empty($meta_value)) {
@@ -2325,23 +2397,26 @@ 
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur ) {
+			do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
-	else
-		return false;
+	if ( !$cur ) {
+			$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+	} elseif ( $cur->meta_value != $meta_value ) {
+			$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	} else {
+			return false;
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
-	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( !$cur ) {
+			do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	} else {
+			do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2385,10 +2460,12 @@ 
 function automatic_feed_links( $add = true ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
-	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+	if ( $add ) {
+			add_theme_support( 'automatic-feed-links' );
+	} else {
+			remove_action( 'wp_head', 'feed_links_extra', 3 );
+	}
+	// Just do this yourself in 3.0+
 }
 
 /**
@@ -2459,10 +2536,11 @@ 
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ( $is_winIE || $is_macIE ) {
+			$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
+	}
 
 	return $text;
 }
@@ -2516,8 +2594,9 @@ 
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
-		return true;
+	if ( isset($plugin_page) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -2589,8 +2668,9 @@ 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
-		$objects[$id] = array();
+	foreach ( $ids as $id ) {
+			$objects[$id] = array();
+	}
 
 	$metas = update_meta_cache('user', $ids);
 
@@ -2621,21 +2701,25 @@ 
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
 	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
-			$user->ID = 0;
+		if ( !isset($user->ID) ) {
+					$user->ID = 0;
+		}
 		if ( ! ( $user instanceof WP_User ) ) {
 			$vars = get_object_vars($user);
 			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
-					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				if ( is_string($user->$field) || is_numeric($user->$field) ) {
+									$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				}
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
-			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
-			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		if ( !isset($user['ID']) ) {
+					$user['ID'] = 0;
+		}
+		foreach ( array_keys($user) as $field ) {
+					$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		}
 		$user['filter'] = $context;
 	}
 
@@ -2661,14 +2745,16 @@ 
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
-		return;
+	if ( empty($posts) ) {
+			return;
+	}
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
-		$post->post_title = $start ? __('First Post') : __('Last Post');
+	if ( empty($post->post_title) ) {
+			$post->post_title = $start ? __('First Post') : __('Last Post');
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2739,11 +2825,13 @@ 
 function get_parent_post_rel_link( $title = '%title' ) {
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
-		$post = get_post($GLOBALS['post']->post_parent);
+	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) {
+			$post = get_post($GLOBALS['post']->post_parent);
+	}
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2786,12 +2874,13 @@ 
 	$user_id = get_current_user_id();
 
 	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
-		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		if ( is_admin() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
+		} elseif ( is_multisite() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+		} else {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		}
 	}
 }
 
@@ -2843,9 +2932,10 @@ 
  */
 function debug_fwrite( $fp, $string ) {
 	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
-}
+	if ( ! empty( $GLOBALS['debug'] ) ) {
+			error_log( $string );
+	}
+	}
 
 /**
  * Close the debugging file handle.
@@ -2879,18 +2969,20 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
-		return $wp_themes;
+	if ( isset( $wp_themes ) ) {
+			return $wp_themes;
+	}
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
 	foreach ( $themes as $theme ) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
-		else
-			$wp_themes[ $name ] = $theme;
+		if ( isset( $wp_themes[ $name ] ) ) {
+					$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		} else {
+					$wp_themes[ $name ] = $theme;
+		}
 	}
 
 	return $wp_themes;
@@ -2910,8 +3002,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) ) {
+			return $themes[ $theme ];
+	}
 	return null;
 }
 
@@ -2927,8 +3020,9 @@ 
 function get_current_theme() {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
 
-	if ( $theme = get_option( 'current_theme' ) )
-		return $theme;
+	if ( $theme = get_option( 'current_theme' ) ) {
+			return $theme;
+	}
 
 	return wp_get_theme()->get('Name');
 }
@@ -2948,10 +3042,11 @@ 
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4.0' );
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
-	else
-		$text = $matches;
+	if ( is_array($matches) ) {
+			$text = $matches[1] . $matches[2] . "</pre>";
+	} else {
+			$text = $matches;
+	}
 
 	$text = str_replace(array('<br />', '<br/>', '<br>'), array('', '', ''), $text);
 	$text = str_replace('<p>', "\n", $text);
@@ -2978,8 +3073,9 @@ 
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-header', $args );
 }
 
@@ -3011,12 +3107,15 @@ 
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
 	$args = array();
-	if ( $wp_head_callback )
-		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
-		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $wp_head_callback ) {
+			$args['wp-head-callback'] = $wp_head_callback;
+	}
+	if ( $admin_head_callback ) {
+			$args['admin-head-callback'] = $admin_head_callback;
+	}
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-background', $args );
 }
 
@@ -3063,8 +3162,9 @@ 
 	);
 
 	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		if ( ! isset( $theme_data[ $extra_header ] ) ) {
+					$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		}
 	}
 
 	return $theme_data;
@@ -3133,9 +3233,10 @@ 
  */
 function sticky_class( $post_id = null ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
-		echo ' sticky';
-}
+	if ( is_sticky( $post_id ) ) {
+			echo ' sticky';
+	}
+	}
 
 /**
  * Retrieve post ancestors.
@@ -3166,16 +3267,18 @@ 
 function wp_load_image( $file ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if ( is_numeric( $file ) ) {
+			$file = get_attached_file( $file );
+	}
 
 	if ( ! is_file( $file ) ) {
 		/* translators: %s: file name */
 		return sprintf( __( 'File &#8220;%s&#8221; doesn&#8217;t exist?' ), $file );
 	}
 
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
+	if ( ! function_exists('imagecreatefromstring') ) {
+			return __('The GD image library is not installed.');
+	}
 
 	// Set artificially high because GD uses uncompressed images in memory.
 	wp_raise_memory_limit( 'image' );
@@ -3218,19 +3321,22 @@ 
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
 	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 	$editor->set_quality( $jpeg_quality );
 
 	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
-		return $resized;
+	if ( is_wp_error( $resized ) ) {
+			return $resized;
+	}
 
 	$dest_file = $editor->generate_filename( $suffix, $dest_path );
 	$saved = $editor->save( $dest_file );
 
-	if ( is_wp_error( $saved ) )
-		return $saved;
+	if ( is_wp_error( $saved ) ) {
+			return $saved;
+	}
 
 	return $dest_file;
 }
@@ -3268,8 +3374,9 @@ 
 function user_pass_ok($user_login, $user_pass) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
 	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
-		return false;
+	if ( is_wp_error( $user ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -3375,8 +3482,9 @@ 
 	global $wp_rich_edit_exists;
 	_deprecated_function( __FUNCTION__, '3.9.0' );
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset( $wp_rich_edit_exists ) ) {
+			$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	}
 
 	return $wp_rich_edit_exists;
 }
@@ -3584,8 +3692,10 @@ 
 function wp_htmledit_pre($output) {
 	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( !empty($output) ) {
+			$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	}
+	// convert only < > &
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3635,21 +3745,24 @@ 
 
 	@set_time_limit( 60 );
 
-	if ( $red > 5 )
-		return false;
+	if ( $red > 5 ) {
+			return false;
+	}
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
-		$options['method'] = 'HEAD';
-	else
-		$options['method'] = 'GET';
+	if ( false == $file_path ) {
+			$options['method'] = 'HEAD';
+	} else {
+			$options['method'] = 'GET';
+	}
 
 	$response = wp_safe_remote_request( $url, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$headers = wp_remote_retrieve_headers( $response );
 	$headers['response'] = wp_remote_retrieve_response_code( $response );
@@ -3659,13 +3772,15 @@ 
 		return wp_get_http( $headers['location'], $file_path, ++$red );
 	}
 
-	if ( false == $file_path )
-		return $headers;
+	if ( false == $file_path ) {
+			return $headers;
+	}
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
-		return $headers;
+	if ( !$out_fp ) {
+			return $headers;
+	}
 
 	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);
@@ -3816,13 +3931,14 @@ 
 function _usort_terms_by_ID( $a, $b ) {
 	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
 
-	if ( $a->term_id > $b->term_id )
-		return 1;
-	elseif ( $a->term_id < $b->term_id )
-		return -1;
-	else
-		return 0;
-}
+	if ( $a->term_id > $b->term_id ) {
+			return 1;
+	} elseif ( $a->term_id < $b->term_id ) {
+			return -1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Sort categories by name.
@@ -3862,19 +3978,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
 
-	if ( empty( $_menu_item_sort_prop ) )
-		return 0;
+	if ( empty( $_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
-		return 0;
+	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
-		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
-		return $_a < $_b ? -1 : 1;
-	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
-}
+	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop ) {
+			return 0;
+	} elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop ) {
+			return $_a < $_b ? -1 : 1;
+	} else {
+			return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+	}
+	}

src/wp-includes/revision.php

Doc Comments +1 added lines, -1 removed lines

@@ -432,7 +432,7 @@
  *
  * @see get_children()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global `$post`.
  * @param array|null  $args    Optional. Arguments for retrieving post revisions. Default null.
  * @return array An array of revisions, or an empty array if none.
  */

Braces +120 added lines, -82 removed lines

@@ -110,20 +110,25 @@ 
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
 function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-		return;
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			return;
+	}
 
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		return;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			return;
+	}
 
-	if ( 'auto-draft' == $post->post_status )
-		return;
+	if ( 'auto-draft' == $post->post_status ) {
+			return;
+	}
 
-	if ( ! wp_revisions_enabled( $post ) )
-		return;
+	if ( ! wp_revisions_enabled( $post ) ) {
+			return;
+	}
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
@@ -189,21 +194,24 @@ 
 	// delete the oldest ones.
 	$revisions_to_keep = wp_revisions_to_keep( $post );
 
-	if ( $revisions_to_keep < 0 )
-		return $return;
+	if ( $revisions_to_keep < 0 ) {
+			return $return;
+	}
 
 	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
-		return $return;
+	if ( $delete < 1 ) {
+			return $return;
+	}
 
 	$revisions = array_slice( $revisions, 0, $delete );
 
 	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
-			continue;
+		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
+					continue;
+		}
 
 		wp_delete_post_revision( $revisions[ $i ]->ID );
 	}
@@ -229,8 +237,9 @@ 
 
 	foreach ( $revisions as $revision ) {
 		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
-				continue;
+			if ( $user_id && $user_id != $revision->post_author ) {
+							continue;
+			}
 
 			return $revision;
 		}
@@ -248,8 +257,9 @@ 
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
 function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
 	return (int) $post->post_parent;
 }
@@ -263,11 +273,13 @@ 
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
 function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
-		return (int) $post->post_parent;
+	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
+			return (int) $post->post_parent;
+	}
 
 	return false;
 }
@@ -283,23 +295,27 @@ 
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
 function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
-		$post = get_post($post, ARRAY_A);
+	if ( is_object($post) ) {
+			$post = get_object_vars( $post );
+	} elseif ( !is_array($post) ) {
+			$post = get_post($post, ARRAY_A);
+	}
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	}
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if ( isset($post['post_type']) && 'revision' == $post['post_type'] ) {
+			return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	}
 
 	$post = _wp_post_revision_data( $post, $autosave );
 	$post = wp_slash($post); //since data is from db
 
 	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
-		return $revision_id;
+	if ( is_wp_error($revision_id) ) {
+			return $revision_id;
+	}
 
 	if ( $revision_id ) {
 		/**
@@ -326,10 +342,12 @@ 
  * @return WP_Post|array|null Null if error or post object if success.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
-		return $revision;
-	if ( 'revision' !== $revision->post_type )
-		return null;
+	if ( !$revision = get_post( $post, OBJECT, $filter ) ) {
+			return $revision;
+	}
+	if ( 'revision' !== $revision->post_type ) {
+			return null;
+	}
 
 	if ( $output == OBJECT ) {
 		return $revision;
@@ -356,27 +374,31 @@ 
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
 function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
-		return $revision;
+	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) {
+			return $revision;
+	}
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	if ( !is_array( $fields ) ) {
+			$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	}
 
 	$update = array();
 	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
-		return false;
+	if ( !$update ) {
+			return false;
+	}
 
 	$update['ID'] = $revision['post_parent'];
 
 	$update = wp_slash( $update ); //since data is from db
 
 	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
-		return $post_id;
+	if ( ! $post_id || is_wp_error( $post_id ) ) {
+			return $post_id;
+	}
 
 	// Update last edit user
 	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
@@ -438,19 +460,22 @@ 
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
-		return array();
+	if ( ! $post || empty( $post->ID ) ) {
+			return array();
+	}
 
 	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
-		return array();
+	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) ) {
+			return array();
+	}
 
 	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
 
-	if ( ! $revisions = get_children( $args ) )
-		return array();
+	if ( ! $revisions = get_children( $args ) ) {
+			return array();
+	}
 
 	return $revisions;
 }
@@ -483,13 +508,15 @@ 
 function wp_revisions_to_keep( $post ) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
-		$num = -1;
-	else
-		$num = intval( $num );
+	if ( true === $num ) {
+			$num = -1;
+	} else {
+			$num = intval( $num );
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		$num = 0;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			$num = 0;
+	}
 
 	/**
 	 * Filters the number of revisions to save for the given post.
@@ -545,8 +572,9 @@ 
 	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) {
+					wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		}
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -564,16 +592,20 @@ 
  * @return array
  */
 function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
-		return $terms;
+	if ( ! $post = get_post() ) {
+			return $terms;
+	}
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
-		return $terms;
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
+			return $terms;
+	}
 
-	if ( 'standard' == $_REQUEST['post_format'] )
-		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	if ( 'standard' == $_REQUEST['post_format'] ) {
+			$terms = array();
+	} elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) ) {
+			$terms = array( $term );
+	}
+	// Can only have one post format
 
 	return $terms;
 }
@@ -616,13 +648,15 @@ 
  * @return int|false
  */
 function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
-		return false;
+	if ( is_object( $revision ) ) {
+			$revision = get_object_vars( $revision );
+	} elseif ( !is_array( $revision ) ) {
+			return false;
+	}
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
-		return (int) $matches[1];
+	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) ) {
+			return (int) $matches[1];
+	}
 
 	return 0;
 }
@@ -676,8 +710,9 @@ 
 		$this_revision_version = _wp_get_post_revision_version( $this_revision );
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
-			continue;
+		if ( false === $this_revision_version ) {
+					continue;
+		}
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
@@ -698,23 +733,26 @@ 
 			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
-				$update['post_author'] = $prev_revision->post_author;
+			if ( $prev_revision_version < 1 ) {
+							$update['post_author'] = $prev_revision->post_author;
+			}
 		}
 
 		// Upgrade this revision
 		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ( $result ) {
+					wp_cache_delete( $this_revision->ID, 'posts' );
+		}
 
 	} while ( $prev_revision );
 
 	delete_option( $lock );
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ( $add_last ) {
+			wp_save_post_revision( $post->ID );
+	}
 
 	return true;
 }

Indentation +5 added lines, -5 removed lines

@@ -596,11 +596,11 @@
 	}
 
 	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
-	     empty( $_REQUEST['preview_id'] ) ||
-	     $post->ID != $post_id ||
-	     '_thumbnail_id' != $meta_key ||
-	     'revision' == $post->post_type ||
-	     $post_id != $_REQUEST['preview_id']
+		 empty( $_REQUEST['preview_id'] ) ||
+		 $post->ID != $post_id ||
+		 '_thumbnail_id' != $meta_key ||
+		 'revision' == $post->post_type ||
+		 $post_id != $_REQUEST['preview_id']
 	) {
 		return $value;
 	}

Spacing +152 added lines, -152 removed lines

@@ -21,19 +21,19 @@ 
  * @param bool          $deprecated Not used.
  * @return array Array of fields that can be versioned.
  */
-function _wp_post_revision_fields( $post = array(), $deprecated = false ) {
+function _wp_post_revision_fields($post = array(), $deprecated = false) {
 	static $fields = null;
 
-	if ( ! is_array( $post ) ) {
-		$post = get_post( $post, ARRAY_A );
+	if ( ! is_array($post)) {
+		$post = get_post($post, ARRAY_A);
 	}
 
-	if ( is_null( $fields ) ) {
+	if (is_null($fields)) {
 		// Allow these to be versioned
 		$fields = array(
-			'post_title' => __( 'Title' ),
-			'post_content' => __( 'Content' ),
-			'post_excerpt' => __( 'Excerpt' ),
+			'post_title' => __('Title'),
+			'post_content' => __('Content'),
+			'post_excerpt' => __('Excerpt'),
 		);
 	}
 
@@ -53,11 +53,11 @@ 
 	 *                      'post_content', and 'post_excerpt' by default.
 	 * @param array $post   A post array being processed for insertion as a post revision.
 	 */
-	$fields = apply_filters( '_wp_post_revision_fields', $fields, $post );
+	$fields = apply_filters('_wp_post_revision_fields', $fields, $post);
 
 	// WP uses these internally either in versioning or elsewhere - they cannot be versioned
-	foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) {
-		unset( $fields[ $protect ] );
+	foreach (array('ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author') as $protect) {
+		unset($fields[$protect]);
 	}
 
 
@@ -75,25 +75,25 @@ 
  * @param bool          $autosave Optional. Is the revision an autosave? Default false.
  * @return array Post array ready to be inserted as a post revision.
  */
-function _wp_post_revision_data( $post = array(), $autosave = false ) {
-	if ( ! is_array( $post ) ) {
-		$post = get_post( $post, ARRAY_A );
+function _wp_post_revision_data($post = array(), $autosave = false) {
+	if ( ! is_array($post)) {
+		$post = get_post($post, ARRAY_A);
 	}
 
-	$fields = _wp_post_revision_fields( $post );
+	$fields = _wp_post_revision_fields($post);
 
 	$revision_data = array();
 
-	foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field ) {
-		$revision_data[ $field ] = $post[ $field ];
+	foreach (array_intersect(array_keys($post), array_keys($fields)) as $field) {
+		$revision_data[$field] = $post[$field];
 	}
 
 	$revision_data['post_parent']   = $post['ID'];
 	$revision_data['post_status']   = 'inherit';
 	$revision_data['post_type']     = 'revision';
 	$revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version
-	$revision_data['post_date']     = isset( $post['post_modified'] ) ? $post['post_modified'] : '';
-	$revision_data['post_date_gmt'] = isset( $post['post_modified_gmt'] ) ? $post['post_modified_gmt'] : '';
+	$revision_data['post_date']     = isset($post['post_modified']) ? $post['post_modified'] : '';
+	$revision_data['post_date_gmt'] = isset($post['post_modified_gmt']) ? $post['post_modified_gmt'] : '';
 
 	return $revision_data;
 }
@@ -109,29 +109,29 @@ 
  * @param int $post_id The ID of the post to save as a revision.
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
-function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+function wp_save_post_revision($post_id) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 		return;
 
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return;
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		return;
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		return;
 
-	if ( ! wp_revisions_enabled( $post ) )
+	if ( ! wp_revisions_enabled($post))
 		return;
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
 	// If no previous revisions, save one
-	if ( $revisions = wp_get_post_revisions( $post_id ) ) {
+	if ($revisions = wp_get_post_revisions($post_id)) {
 		// grab the last revision, but not an autosave
-		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
+		foreach ($revisions as $revision) {
+			if (false !== strpos($revision->post_name, "{$revision->post_parent}-revision")) {
 				$last_revision = $revision;
 				break;
 			}
@@ -151,11 +151,11 @@ 
 		 * @param WP_Post $post              The post object.
 		 *
 		 */
-		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
+		if (isset($last_revision) && apply_filters('wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post)) {
 			$post_has_changed = false;
 
-			foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {
-				if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) {
+			foreach (array_keys(_wp_post_revision_fields($post)) as $field) {
+				if (normalize_whitespace($post->$field) != normalize_whitespace($last_revision->$field)) {
 					$post_has_changed = true;
 					break;
 				}
@@ -174,38 +174,38 @@ 
 			 * @param WP_Post $post             The post object.
 			 *
 			 */
-			$post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
+			$post_has_changed = (bool) apply_filters('wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post);
 
 			//don't save revision if post unchanged
-			if ( ! $post_has_changed ) {
+			if ( ! $post_has_changed) {
 				return;
 			}
 		}
 	}
 
-	$return = _wp_put_post_revision( $post );
+	$return = _wp_put_post_revision($post);
 
 	// If a limit for the number of revisions to keep has been set,
 	// delete the oldest ones.
-	$revisions_to_keep = wp_revisions_to_keep( $post );
+	$revisions_to_keep = wp_revisions_to_keep($post);
 
-	if ( $revisions_to_keep < 0 )
+	if ($revisions_to_keep < 0)
 		return $return;
 
-	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
+	$revisions = wp_get_post_revisions($post_id, array('order' => 'ASC'));
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
+	if ($delete < 1)
 		return $return;
 
-	$revisions = array_slice( $revisions, 0, $delete );
+	$revisions = array_slice($revisions, 0, $delete);
 
-	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
+	for ($i = 0; isset($revisions[$i]); $i++) {
+		if (false !== strpos($revisions[$i]->post_name, 'autosave'))
 			continue;
 
-		wp_delete_post_revision( $revisions[ $i ]->ID );
+		wp_delete_post_revision($revisions[$i]->ID);
 	}
 
 	return $return;
@@ -224,12 +224,12 @@ 
  * @param int $user_id Optional The post author ID.
  * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
  */
-function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-	$revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
+function wp_get_post_autosave($post_id, $user_id = 0) {
+	$revisions = wp_get_post_revisions($post_id, array('check_enabled' => false));
 
-	foreach ( $revisions as $revision ) {
-		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
+	foreach ($revisions as $revision) {
+		if (false !== strpos($revision->post_name, "{$post_id}-autosave")) {
+			if ($user_id && $user_id != $revision->post_author)
 				continue;
 
 			return $revision;
@@ -247,8 +247,8 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
-function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_revision($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
 	return (int) $post->post_parent;
@@ -262,11 +262,11 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
-function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_autosave($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
+	if (false !== strpos($post->post_name, "{$post->post_parent}-autosave"))
 		return (int) $post->post_parent;
 
 	return false;
@@ -282,26 +282,26 @@ 
  * @param bool                   $autosave Optional. Is the revision an autosave?
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
-function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
+function _wp_put_post_revision($post = null, $autosave = false) {
+	if (is_object($post))
+		$post = get_object_vars($post);
+	elseif ( ! is_array($post))
 		$post = get_post($post, ARRAY_A);
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']))
+		return new WP_Error('invalid_post', __('Invalid post ID.'));
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if (isset($post['post_type']) && 'revision' == $post['post_type'])
+		return new WP_Error('post_type', __('Cannot create a revision of a revision'));
 
-	$post = _wp_post_revision_data( $post, $autosave );
+	$post = _wp_post_revision_data($post, $autosave);
 	$post = wp_slash($post); //since data is from db
 
-	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
+	$revision_id = wp_insert_post($post);
+	if (is_wp_error($revision_id))
 		return $revision_id;
 
-	if ( $revision_id ) {
+	if ($revision_id) {
 		/**
 		 * Fires once a revision has been saved.
 		 *
@@ -309,7 +309,7 @@ 
 		 *
 		 * @param int $revision_id Post revision ID.
 		 */
-		do_action( '_wp_put_post_revision', $revision_id );
+		do_action('_wp_put_post_revision', $revision_id);
 	}
 
 	return $revision_id;
@@ -327,17 +327,17 @@ 
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
+	if ( ! $revision = get_post($post, OBJECT, $filter))
 		return $revision;
-	if ( 'revision' !== $revision->post_type )
+	if ('revision' !== $revision->post_type)
 		return null;
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $revision;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$_revision = get_object_vars($revision);
 		return $_revision;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$_revision = array_values(get_object_vars($revision));
 		return $_revision;
 	}
@@ -356,31 +356,31 @@ 
  * @param array       $fields      Optional. What fields to restore from. Defaults to all.
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
-function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
+function wp_restore_post_revision($revision_id, $fields = null) {
+	if ( ! $revision = wp_get_post_revision($revision_id, ARRAY_A))
 		return $revision;
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	if ( ! is_array($fields))
+		$fields = array_keys(_wp_post_revision_fields($revision));
 
 	$update = array();
-	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
+	foreach (array_intersect(array_keys($revision), $fields) as $field) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
+	if ( ! $update)
 		return false;
 
 	$update['ID'] = $revision['post_parent'];
 
-	$update = wp_slash( $update ); //since data is from db
+	$update = wp_slash($update); //since data is from db
 
-	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
+	$post_id = wp_update_post($update);
+	if ( ! $post_id || is_wp_error($post_id))
 		return $post_id;
 
 	// Update last edit user
-	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
+	update_post_meta($post_id, '_edit_last', get_current_user_id());
 
 	/**
 	 * Fires after a post revision has been restored.
@@ -390,7 +390,7 @@ 
 	 * @param int $post_id     Post ID.
 	 * @param int $revision_id Post revision ID.
 	 */
-	do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
+	do_action('wp_restore_post_revision', $post_id, $revision['ID']);
 
 	return $post_id;
 }
@@ -405,13 +405,13 @@ 
  * @param int|WP_Post $revision_id Revision ID or revision object.
  * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success.
  */
-function wp_delete_post_revision( $revision_id ) {
-	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+function wp_delete_post_revision($revision_id) {
+	if ( ! $revision = wp_get_post_revision($revision_id)) {
 		return $revision;
 	}
 
-	$delete = wp_delete_post( $revision->ID );
-	if ( $delete ) {
+	$delete = wp_delete_post($revision->ID);
+	if ($delete) {
 		/**
 		 * Fires once a post revision has been deleted.
 		 *
@@ -420,7 +420,7 @@ 
 		 * @param int          $revision_id Post revision ID.
 		 * @param object|array $revision    Post revision object or array.
 		 */
-		do_action( 'wp_delete_post_revision', $revision->ID, $revision );
+		do_action('wp_delete_post_revision', $revision->ID, $revision);
 	}
 
 	return $delete;
@@ -437,20 +437,20 @@ 
  * @param array|null  $args    Optional. Arguments for retrieving post revisions. Default null.
  * @return array An array of revisions, or an empty array if none.
  */
-function wp_get_post_revisions( $post_id = 0, $args = null ) {
-	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
+function wp_get_post_revisions($post_id = 0, $args = null) {
+	$post = get_post($post_id);
+	if ( ! $post || empty($post->ID))
 		return array();
 
-	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true);
+	$args = wp_parse_args($args, $defaults);
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
+	if ($args['check_enabled'] && ! wp_revisions_enabled($post))
 		return array();
 
-	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
+	$args = array_merge($args, array('post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit'));
 
-	if ( ! $revisions = get_children( $args ) )
+	if ( ! $revisions = get_children($args))
 		return array();
 
 	return $revisions;
@@ -464,8 +464,8 @@ 
  * @param WP_Post $post The post object.
  * @return bool True if number of revisions to keep isn't zero, false otherwise.
  */
-function wp_revisions_enabled( $post ) {
-	return wp_revisions_to_keep( $post ) !== 0;
+function wp_revisions_enabled($post) {
+	return wp_revisions_to_keep($post) !== 0;
 }
 
 /**
@@ -481,15 +481,15 @@ 
  * @param WP_Post $post The post object.
  * @return int The number of revisions to keep.
  */
-function wp_revisions_to_keep( $post ) {
+function wp_revisions_to_keep($post) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
+	if (true === $num)
 		$num = -1;
 	else
-		$num = intval( $num );
+		$num = intval($num);
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		$num = 0;
 
 	/**
@@ -502,7 +502,7 @@ 
 	 * @param int     $num  Number of revisions to store.
 	 * @param WP_Post $post Post object.
 	 */
-	return (int) apply_filters( 'wp_revisions_to_keep', $num, $post );
+	return (int) apply_filters('wp_revisions_to_keep', $num, $post);
 }
 
 /**
@@ -514,24 +514,24 @@ 
  * @param WP_Post $post
  * @return WP_Post|false
  */
-function _set_preview( $post ) {
-	if ( ! is_object( $post ) ) {
+function _set_preview($post) {
+	if ( ! is_object($post)) {
 		return $post;
 	}
 
-	$preview = wp_get_post_autosave( $post->ID );
-	if ( ! is_object( $preview ) ) {
+	$preview = wp_get_post_autosave($post->ID);
+	if ( ! is_object($preview)) {
 		return $post;
 	}
 
-	$preview = sanitize_post( $preview );
+	$preview = sanitize_post($preview);
 
 	$post->post_content = $preview->post_content;
 	$post->post_title = $preview->post_title;
 	$post->post_excerpt = $preview->post_excerpt;
 
-	add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
-	add_filter( 'get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 3 );
+	add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
+	add_filter('get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 3);
 
 	return $post;
 }
@@ -543,11 +543,11 @@ 
  * @access private
  */
 function _show_post_preview() {
-	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
+	if (isset($_GET['preview_id']) && isset($_GET['preview_nonce'])) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if (false === wp_verify_nonce($_GET['preview_nonce'], 'post_preview_'.$id))
+			wp_die(__('Sorry, you are not allowed to preview drafts.'));
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -564,17 +564,17 @@ 
  * @param string $taxonomy
  * @return array
  */
-function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
+function _wp_preview_terms_filter($terms, $post_id, $taxonomy) {
+	if ( ! $post = get_post())
 		return $terms;
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
+	if (empty($_REQUEST['post_format']) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type)
 		return $terms;
 
-	if ( 'standard' == $_REQUEST['post_format'] )
+	if ('standard' == $_REQUEST['post_format'])
 		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	elseif ($term = get_term_by('slug', 'post-format-'.sanitize_key($_REQUEST['post_format']), 'post_format'))
+		$terms = array($term); // Can only have one post format
 
 	return $terms;
 }
@@ -590,13 +590,13 @@ 
  * @param string            $meta_key Meta key.
  * @return null|array The default return value or the post thumbnail meta array.
  */
-function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
-	if ( ! $post = get_post() ) {
+function _wp_preview_post_thumbnail_filter($value, $post_id, $meta_key) {
+	if ( ! $post = get_post()) {
 		return $value;
 	}
 
-	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
-	     empty( $_REQUEST['preview_id'] ) ||
+	if (empty($_REQUEST['_thumbnail_id']) ||
+	     empty($_REQUEST['preview_id']) ||
 	     $post->ID != $post_id ||
 	     '_thumbnail_id' != $meta_key ||
 	     'revision' == $post->post_type ||
@@ -605,12 +605,12 @@ 
 		return $value;
 	}
 
-	$thumbnail_id = intval( $_REQUEST['_thumbnail_id'] );
-	if ( $thumbnail_id <= 0 ) {
+	$thumbnail_id = intval($_REQUEST['_thumbnail_id']);
+	if ($thumbnail_id <= 0) {
 		return '';
 	}
 
-	return strval( $thumbnail_id );
+	return strval($thumbnail_id);
 }
 
 /**
@@ -622,13 +622,13 @@ 
  * @param WP_Post $revision
  * @return int|false
  */
-function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
+function _wp_get_post_revision_version($revision) {
+	if (is_object($revision))
+		$revision = get_object_vars($revision);
+	elseif ( ! is_array($revision))
 		return false;
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
+	if (preg_match('/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches))
 		return (int) $matches[1];
 
 	return 0;
@@ -646,23 +646,23 @@ 
  * @param array   $revisions Current revisions of the post
  * @return bool true if the revisions were upgraded, false if problems
  */
-function _wp_upgrade_revisions_of_post( $post, $revisions ) {
+function _wp_upgrade_revisions_of_post($post, $revisions) {
 	global $wpdb;
 
 	// Add post option exclusively
 	$lock = "revision-upgrade-{$post->ID}";
 	$now = time();
-	$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
-	if ( ! $result ) {
+	$result = $wpdb->query($wpdb->prepare("INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now));
+	if ( ! $result) {
 		// If we couldn't get a lock, see how old the previous lock is
-		$locked = get_option( $lock );
-		if ( ! $locked ) {
+		$locked = get_option($lock);
+		if ( ! $locked) {
 			// Can't write to the lock, and can't read the lock.
 			// Something broken has happened
 			return false;
 		}
 
-		if ( $locked > $now - 3600 ) {
+		if ($locked > $now - 3600) {
 			// Lock is not too old: some other process may be upgrading this post.  Bail.
 			return false;
 		}
@@ -671,57 +671,57 @@ 
 	}
 
 	// If we could get a lock, re-"add" the option to fire all the correct filters.
-	update_option( $lock, $now );
+	update_option($lock, $now);
 
-	reset( $revisions );
+	reset($revisions);
 	$add_last = true;
 
 	do {
-		$this_revision = current( $revisions );
-		$prev_revision = next( $revisions );
+		$this_revision = current($revisions);
+		$prev_revision = next($revisions);
 
-		$this_revision_version = _wp_get_post_revision_version( $this_revision );
+		$this_revision_version = _wp_get_post_revision_version($this_revision);
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
+		if (false === $this_revision_version)
 			continue;
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
-		if ( 0 < $this_revision_version ) {
+		if (0 < $this_revision_version) {
 			$add_last = false;
 			continue;
 		}
 
 		// Always update the revision version
 		$update = array(
-			'post_name' => preg_replace( '/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name ),
+			'post_name' => preg_replace('/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name),
 		);
 
 		// If this revision is the oldest revision of the post, i.e. no $prev_revision,
 		// the correct post_author is probably $post->post_author, but that's only a good guess.
 		// Update the revision version only and Leave the author as-is.
-		if ( $prev_revision ) {
-			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
+		if ($prev_revision) {
+			$prev_revision_version = _wp_get_post_revision_version($prev_revision);
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
+			if ($prev_revision_version < 1)
 				$update['post_author'] = $prev_revision->post_author;
 		}
 
 		// Upgrade this revision
-		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
+		$result = $wpdb->update($wpdb->posts, $update, array('ID' => $this_revision->ID));
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ($result)
+			wp_cache_delete($this_revision->ID, 'posts');
 
-	} while ( $prev_revision );
+	} while ($prev_revision);
 
-	delete_option( $lock );
+	delete_option($lock);
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ($add_last)
+		wp_save_post_revision($post->ID);
 
 	return true;
 }