ntwb / wordpress

src/wp-admin/upload.php

Braces +32 added lines, -21 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('upload_files') )
+if ( !current_user_can('upload_files') ) {
 	wp_die( __( 'You do not have permission to upload files.' ) );
+}
 
 $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
@@ -114,8 +115,9 @@ 
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
+					$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 
 	switch ( $doaction ) {
@@ -128,38 +130,47 @@ 
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+				}
 
-				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.' ) );
+				}
 			}
 			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this item out of 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.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this item.' ) );
+				if ( !current_user_can( 'delete_post', $post_id_del ) ) {
+									wp_die( __( 'You are not allowed to delete this item.' ) );
+				}
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( !wp_delete_attachment( $post_id_del ) ) {
+									wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;

src/wp-admin/includes/upgrade.php

Braces +368 added lines, -237 removed lines

@@ -9,8 +9,9 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
+if ( file_exists(WP_CONTENT_DIR . '/install.php') ) {
 	require (WP_CONTENT_DIR . '/install.php');
+}
 
 /** WordPress Administration API */
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -37,8 +38,9 @@ 
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.6' );
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -59,8 +61,9 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
-		update_option('default_pingback_flag', 0);
+	if ( ! $public ) {
+			update_option('default_pingback_flag', 0);
+	}
 
 	/*
 	 * Create default user. If the user already exists, the user tables are
@@ -220,8 +223,9 @@ 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
+	if ( is_multisite() ) {
+			$first_page = get_site_option( 'first_page', $first_page );
+	}
 	$first_post_guid = get_option('home') . '/?page_id=2';
 	$wpdb->insert( $wpdb->posts, array(
 		'post_author' => $user_id,
@@ -252,10 +256,11 @@ 
 	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
 	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
 
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	if ( ! is_multisite() ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 1 );
+	} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	}
 
 	if ( is_multisite() ) {
 		// Flush rules to pick up the new page.
@@ -270,8 +275,9 @@ 
 		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( !is_super_admin( $user_id ) && $user_id != 1 ) {
+					$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		}
 	}
 }
 endif;
@@ -407,26 +413,30 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
-	if ( ! is_blog_installed() )
-		return;
+	if ( ! is_blog_installed() ) {
+			return;
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
-		upgrade_network();
+	if ( is_multisite() && is_main_site() ) {
+			upgrade_network();
+	}
 	wp_cache_flush();
 
 	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
-		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
+					$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+		} else {
+					$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		}
 	}
 
 	/**
@@ -458,8 +468,9 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty($wp_current_db_version) ) {
@@ -467,12 +478,14 @@ 
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
-			$wp_current_db_version = 2541;
+		if ( !empty($template) ) {
+					$wp_current_db_version = 2541;
+		}
 	}
 
-	if ( $wp_current_db_version < 6039 )
-		upgrade_230_options_table();
+	if ( $wp_current_db_version < 6039 ) {
+			upgrade_230_options_table();
+	}
 
 	populate_options();
 
@@ -483,74 +496,97 @@ 
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
-		upgrade_160();
+	if ( $wp_current_db_version < 3308 ) {
+			upgrade_160();
+	}
 
-	if ( $wp_current_db_version < 4772 )
-		upgrade_210();
+	if ( $wp_current_db_version < 4772 ) {
+			upgrade_210();
+	}
 
-	if ( $wp_current_db_version < 4351 )
-		upgrade_old_slugs();
+	if ( $wp_current_db_version < 4351 ) {
+			upgrade_old_slugs();
+	}
 
-	if ( $wp_current_db_version < 5539 )
-		upgrade_230();
+	if ( $wp_current_db_version < 5539 ) {
+			upgrade_230();
+	}
 
-	if ( $wp_current_db_version < 6124 )
-		upgrade_230_old_tables();
+	if ( $wp_current_db_version < 6124 ) {
+			upgrade_230_old_tables();
+	}
 
-	if ( $wp_current_db_version < 7499 )
-		upgrade_250();
+	if ( $wp_current_db_version < 7499 ) {
+			upgrade_250();
+	}
 
-	if ( $wp_current_db_version < 7935 )
-		upgrade_252();
+	if ( $wp_current_db_version < 7935 ) {
+			upgrade_252();
+	}
 
-	if ( $wp_current_db_version < 8201 )
-		upgrade_260();
+	if ( $wp_current_db_version < 8201 ) {
+			upgrade_260();
+	}
 
-	if ( $wp_current_db_version < 8989 )
-		upgrade_270();
+	if ( $wp_current_db_version < 8989 ) {
+			upgrade_270();
+	}
 
-	if ( $wp_current_db_version < 10360 )
-		upgrade_280();
+	if ( $wp_current_db_version < 10360 ) {
+			upgrade_280();
+	}
 
-	if ( $wp_current_db_version < 11958 )
-		upgrade_290();
+	if ( $wp_current_db_version < 11958 ) {
+			upgrade_290();
+	}
 
-	if ( $wp_current_db_version < 15260 )
-		upgrade_300();
+	if ( $wp_current_db_version < 15260 ) {
+			upgrade_300();
+	}
 
-	if ( $wp_current_db_version < 19389 )
-		upgrade_330();
+	if ( $wp_current_db_version < 19389 ) {
+			upgrade_330();
+	}
 
-	if ( $wp_current_db_version < 20080 )
-		upgrade_340();
+	if ( $wp_current_db_version < 20080 ) {
+			upgrade_340();
+	}
 
-	if ( $wp_current_db_version < 22422 )
-		upgrade_350();
+	if ( $wp_current_db_version < 22422 ) {
+			upgrade_350();
+	}
 
-	if ( $wp_current_db_version < 25824 )
-		upgrade_370();
+	if ( $wp_current_db_version < 25824 ) {
+			upgrade_370();
+	}
 
-	if ( $wp_current_db_version < 26148 )
-		upgrade_372();
+	if ( $wp_current_db_version < 26148 ) {
+			upgrade_372();
+	}
 
-	if ( $wp_current_db_version < 26691 )
-		upgrade_380();
+	if ( $wp_current_db_version < 26691 ) {
+			upgrade_380();
+	}
 
-	if ( $wp_current_db_version < 29630 )
-		upgrade_400();
+	if ( $wp_current_db_version < 29630 ) {
+			upgrade_400();
+	}
 
-	if ( $wp_current_db_version < 33055 )
-		upgrade_430();
+	if ( $wp_current_db_version < 33055 ) {
+			upgrade_430();
+	}
 
-	if ( $wp_current_db_version < 33056 )
-		upgrade_431();
+	if ( $wp_current_db_version < 33056 ) {
+			upgrade_431();
+	}
 
-	if ( $wp_current_db_version < 35700 )
-		upgrade_440();
+	if ( $wp_current_db_version < 35700 ) {
+			upgrade_440();
+	}
 
-	if ( $wp_current_db_version < 36686 )
-		upgrade_450();
+	if ( $wp_current_db_version < 36686 ) {
+			upgrade_450();
+	}
 
 	maybe_disable_link_manager();
 
@@ -603,8 +639,10 @@ 
 			$done_posts[] = $done_id->post_id;
 		endforeach;
 		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
-	else:
+	else {
+		:
 		$catwhere = '';
+	}
 	endif;
 
 	$allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
@@ -721,10 +759,11 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
-				$guid = get_permalink($post->ID);
-			else
-				$guid = $post->guid;
+			if ( empty($post->guid) ) {
+							$guid = get_permalink($post->ID);
+			} else {
+							$guid = $post->guid;
+			}
 
 			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
 
@@ -806,34 +845,57 @@ 
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
 	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		if ( !empty( $user->user_firstname ) ) {
+					update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
+		}
+		if ( !empty( $user->user_lastname ) ) {
+					update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
+		}
+		if ( !empty( $user->user_nickname ) ) {
+					update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
+		}
+		if ( !empty( $user->user_level ) ) {
+					update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+		}
+		if ( !empty( $user->user_icq ) ) {
+					update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_aim ) ) {
+					update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
+		}
+		if ( !empty( $user->user_msn ) ) {
+					update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
+		}
+		if ( !empty( $user->user_yim ) ) {
+					update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_description ) ) {
+					update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		}
 
 		if ( isset( $user->user_idmode ) ):
 			$idmode = $user->user_idmode;
-			if ($idmode == 'nickname') $id = $user->user_nickname;
-			if ($idmode == 'login') $id = $user->user_login;
-			if ($idmode == 'firstname') $id = $user->user_firstname;
-			if ($idmode == 'lastname') $id = $user->user_lastname;
-			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
-			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
+			if ($idmode == 'nickname') {
+				$id = $user->user_nickname;
+			}
+			if ($idmode == 'login') {
+				$id = $user->user_login;
+			}
+			if ($idmode == 'firstname') {
+				$id = $user->user_firstname;
+			}
+			if ($idmode == 'lastname') {
+				$id = $user->user_lastname;
+			}
+			if ($idmode == 'namefl') {
+				$id = $user->user_firstname.' '.$user->user_lastname;
+			}
+			if ($idmode == 'namelf') {
+				$id = $user->user_lastname.' '.$user->user_firstname;
+			}
+			if (!$idmode) {
+				$id = $user->user_nickname;
+			}
 			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
 		endif;
 
@@ -848,15 +910,17 @@ 
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	foreach ( $old_user_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	}
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
-		foreach ($comments as $comment)
+	if ( is_array( $comments ) ) {
+			foreach ($comments as $comment)
 			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+	}
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
@@ -871,8 +935,9 @@ 
 										 array( 'ID' => $object->ID ) );
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']) ) {
+							update_attached_file( $object->ID, $meta['file'] );
+			}
 		}
 	}
 }
@@ -893,8 +958,10 @@ 
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts) ) {
+			foreach ($posts as $post) {
 			$status = $post->post_status;
+		}
 			$type = 'post';
 
 			if ( 'static' == $status ) {
@@ -919,9 +986,10 @@ 
 		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( !empty($posts) ) {
+					foreach ( $posts as $post )
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+		}
 	}
 }
 
@@ -1007,19 +1075,22 @@ 
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
-		$select .= ', rel_type';
+	if ( $have_tags ) {
+			$select .= ', rel_type';
+	}
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
 	foreach ( $posts as $post ) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
-			$taxonomy = 'tag';
+		if ( !empty($post->rel_type) && 'tag' == $post->rel_type) {
+					$taxonomy = 'tag';
+		}
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
-			continue;
+		if ( empty($tt_id) ) {
+					continue;
+		}
 
 		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
 	}
@@ -1061,15 +1132,19 @@ 
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
+		if ( !empty($links) ) {
+			foreach ( $links as $link ) {
 			if ( 0 == $link->link_category )
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
-				continue;
+		}
+			if ( ! isset($link_cat_id_map[$link->link_category]) ) {
+							continue;
+			}
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
 		}
@@ -1083,8 +1158,9 @@ 
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
 		}
 	}
@@ -1097,10 +1173,11 @@ 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
 	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) ) {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		} else {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		}
 		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
 	}
 }
@@ -1117,8 +1194,9 @@ 
 	global $wpdb;
 	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	foreach ( $old_options_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	}
 	$wpdb->show_errors();
 }
 
@@ -1193,9 +1271,10 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
-		populate_roles_260();
-}
+	if ( $wp_current_db_version < 8000 ) {
+			populate_roles_260();
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.7.
@@ -1209,13 +1288,15 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
-		populate_roles_270();
+	if ( $wp_current_db_version < 8980 ) {
+			populate_roles_270();
+	}
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
-}
+	if ( $wp_current_db_version < 8921 ) {
+			$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.8.
@@ -1229,15 +1310,17 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
-		populate_roles_280();
+	if ( $wp_current_db_version < 10360 ) {
+			populate_roles_280();
+	}
 	if ( is_multisite() ) {
 		$start = 0;
 		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->option_value ) {
 					update_option( $row->option_name, $value );
 				}
@@ -1280,11 +1363,13 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
-		populate_roles_300();
+	if ( $wp_current_db_version < 15093 ) {
+			populate_roles_300();
+	}
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
+			add_site_option( 'siteurl', '' );
+	}
 
 	// 3.0 screen options key name changes.
 	if ( wp_should_upgrade_global_tables() ) {
@@ -1332,23 +1417,26 @@ 
 		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
 	}
 
-	if ( $wp_current_db_version >= 11548 )
-		return;
+	if ( $wp_current_db_version >= 11548 ) {
+			return;
+	}
 
 	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
-		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
-		$sidebars_widgets['array_version'] = 1;
+	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) ) {
+			$sidebars_widgets['array_version'] = 3;
+	} elseif ( !isset($sidebars_widgets['array_version']) ) {
+			$sidebars_widgets['array_version'] = 1;
+	}
 
 	switch ( $sidebars_widgets['array_version'] ) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
+			foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+						if ( is_array($sidebar) )
 			foreach ( (array) $sidebar as $i => $name ) {
 				$id = strtolower($name);
+			}
 				if ( isset($wp_registered_widgets[$id]) ) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
@@ -1373,8 +1461,9 @@ 
 					}
 				}
 
-				if ( $found )
-					continue;
+				if ( $found ) {
+									continue;
+				}
 
 				unset($_sidebars_widgets[$index][$i]);
 			}
@@ -1438,14 +1527,17 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 1 );
+	}
+	// Previously set to 0 by populate_options()
 
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			if ( false !== strpos( $name, '-' ) ) {
+						$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			}
 		}
 		if ( $meta_keys ) {
 			$meta_keys = implode( "', '", $meta_keys );
@@ -1453,9 +1545,10 @@ 
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
-}
+	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
+			wp_delete_term( $term->term_id, 'post_format' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.
@@ -1467,9 +1560,10 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
-}
+	if ( $wp_current_db_version < 25824 ) {
+			wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.2.
@@ -1482,9 +1576,10 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
-}
+	if ( $wp_current_db_version < 26148 ) {
+			wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.8.0.
@@ -1719,10 +1814,11 @@ 
 		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
 		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
 		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
-				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
-			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			if ( !$active_sitewide_plugins ) {
+							$sitewide_plugins = (array) $wpmu_sitewide_plugins;
+			} else {
+							$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			}
 
 			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
 		}
@@ -1733,8 +1829,9 @@ 
 		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->meta_value ) {
 					update_site_option( $row->meta_key, $value );
 				}
@@ -1744,16 +1841,19 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ( $wp_current_db_version < 13576 ) {
+			update_site_option( 'global_terms_enabled', '1' );
+	}
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ( $wp_current_db_version < 19390 ) {
+			update_site_option( 'initial_db_version', $wp_current_db_version );
+	}
 
 	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+		if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
+					update_site_option( 'active_sitewide_plugins', array() );
+		}
 	}
 
 	// 3.4
@@ -1765,8 +1865,9 @@ 
 			$converted = array();
 			$themes = wp_get_themes();
 			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) ) {
+									$converted[ $stylesheet ] = true;
+				}
 			}
 			update_site_option( 'allowedthemes', $converted );
 			delete_site_option( 'allowed_themes' );
@@ -1774,8 +1875,9 @@ 
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ( $wp_current_db_version < 21823 ) {
+			update_site_option( 'ms_files_rewriting', '1' );
+	}
 
 	// 3.5.2
 	if ( $wp_current_db_version < 24448 ) {
@@ -2006,8 +2108,9 @@ 
 	$all_options = new stdClass;
 	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
 		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
+							$option->option_value = untrailingslashit( $option->option_value );
+			}
 			$all_options->{$option->option_name} = stripslashes( $option->option_value );
 		}
 	}
@@ -2029,19 +2132,23 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 
 	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ( 'home' == $setting && '' == $option ) {
+			return __get_option( 'siteurl' );
+	}
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
+			$option = untrailingslashit( $option );
+	}
 
 	return maybe_unserialize( $option );
 }
@@ -2094,8 +2201,9 @@ 
 function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+		    $queries = wp_get_db_schema( $queries );
+	}
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {
@@ -2167,8 +2275,9 @@ 
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
 		$wpdb->suppress_errors( $suppress );
 
-		if ( ! $tablefields )
-			continue;
+		if ( ! $tablefields ) {
+					continue;
+		}
 
 		// Clear the field and index arrays.
 		$cfields = $indices = array();
@@ -2292,7 +2401,9 @@ 
 
 				// For each column in the index.
 				foreach ($index_data['columns'] as $column_data) {
-					if ($index_columns != '') $index_columns .= ',';
+					if ($index_columns != '') {
+						$index_columns .= ',';
+					}
 
 					// Add the field to the column list string.
 					$index_columns .= $column_data['fieldname'];
@@ -2361,7 +2472,9 @@ 
 function make_db_current( $tables = 'all' ) {
 	$alterations = dbDelta( $tables );
 	echo "<ol>\n";
-	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach ($alterations as $alteration) {
+		echo "<li>$alteration</li>\n";
+	}
 	echo "</ol>\n";
 }
 
@@ -2396,8 +2509,9 @@ 
 	$home_path = get_home_path();
 	$site_dir = WP_CONTENT_DIR . "/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
-		return false;
+	if (! file_exists("$home_path/index.php")) {
+			return false;
+	}
 
 	/*
 	 * Copy files from the old locations to the site theme.
@@ -2406,25 +2520,28 @@ 
 	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 
 	foreach ($files as $oldfile => $newfile) {
-		if ($oldfile == 'index.php')
-			$oldpath = $home_path;
-		else
-			$oldpath = ABSPATH;
+		if ($oldfile == 'index.php') {
+					$oldpath = $home_path;
+		} else {
+					$oldpath = ABSPATH;
+		}
 
 		// Check to make sure it's not a new index.
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
-					return false;
+				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) {
+									return false;
+				}
 
 				// Don't copy anything.
 				continue;
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
-			return false;
+		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) {
+					return false;
+		}
 
 		chmod("$site_dir/$newfile", 0777);
 
@@ -2434,8 +2551,9 @@ 
 			$f = fopen("$site_dir/$newfile", 'w');
 
 			foreach ($lines as $line) {
-				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+				if (preg_match('/require.*wp-blog-header/', $line)) {
+									$line = '//' . $line;
+				}
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2485,10 +2603,12 @@ 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
 		while(($theme_file = readdir( $theme_dir )) !== false) {
-			if (is_dir("$default_dir/$theme_file"))
-				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
-				return;
+			if (is_dir("$default_dir/$theme_file")) {
+							continue;
+			}
+			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file")) {
+							return;
+			}
 			chmod("$site_dir/$theme_file", 0777);
 		}
 	}
@@ -2500,11 +2620,17 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
-			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
-			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
-			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+			if (strpos($line, 'Theme Name:') !== false) {
+				$line = 'Theme Name: ' . $theme_name;
+			} elseif (strpos($line, 'Theme URI:') !== false) {
+				$line = 'Theme URI: ' . __get_option('url');
+			} elseif (strpos($line, 'Description:') !== false) {
+				$line = 'Description: Your theme.';
+			} elseif (strpos($line, 'Version:') !== false) {
+				$line = 'Version: 1';
+			} elseif (strpos($line, 'Author:') !== false) {
+				$line = 'Author: You';
+			}
 			fwrite($f, $line . "\n");
 		}
 		fclose($f);
@@ -2519,10 +2645,12 @@ 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
 		while(($image = readdir($images_dir)) !== false) {
-			if (is_dir("$default_dir/images/$image"))
-				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
-				return;
+			if (is_dir("$default_dir/images/$image")) {
+							continue;
+			}
+			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image")) {
+							return;
+			}
 			chmod("$site_dir/images/$image", 0777);
 		}
 	}
@@ -2565,9 +2693,10 @@ 
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
-			// TODO: rm -rf the site theme directory.
+		if (! make_site_theme_from_default($theme_name, $template)) {
+					// TODO: rm -rf the site theme directory.
 			return false;
+		}
 	}
 
 	// Make the new site theme active.
@@ -2618,9 +2747,10 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
-}
+	if ( is_wp_error( $result ) ) {
+			die( $result->get_error_message() );
+	}
+	}
 
 /**
  * Disables the Automattic widgets plugin, which was merged into core.
@@ -2650,9 +2780,10 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
-}
+	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 0 );
+	}
+	}
 
 /**
  * Runs before the schema is upgraded.

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

Braces +11 added lines, -8 removed lines

@@ -123,8 +123,9 @@ 
 		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) ) {
+					$tab = key( $tabs );
+		}
 
 		$args = array(
 			'page' => $paged,
@@ -172,10 +173,11 @@ 
 			case 'favorites':
 				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
 				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-				if ( $user )
-					$args['user'] = $user;
-				else
-					$args = false;
+				if ( $user ) {
+									$args['user'] = $user;
+				} else {
+									$args = false;
+				}
 
 				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
 				break;
@@ -197,8 +199,9 @@ 
 		 */
 		$args = apply_filters( "install_plugins_table_api_args_$tab", $args );
 
-		if ( !$args )
-			return;
+		if ( !$args ) {
+					return;
+		}
 
 		$api = plugins_api( 'query_plugins', $args );
 

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

Braces +91 added lines, -59 removed lines

@@ -199,10 +199,11 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		} else {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -266,8 +267,9 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
-			return array();
+		if ( !empty($locked_post_status) ) {
+					return array();
+		}
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -476,8 +478,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -526,19 +529,21 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' === $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' === $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
+					$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -599,8 +604,9 @@ 
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
-			$posts = $wp_query->posts;
+		if ( empty( $posts ) ) {
+					$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -619,13 +625,15 @@ 
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
-			$post_ids[] = $a_post->ID;
+		foreach ( $posts as $a_post ) {
+					$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ( $posts as $post ) {
+					$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -643,8 +651,9 @@ 
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
-				return;
+			if ( ! $pages ) {
+							return;
+			}
 		}
 
 		/*
@@ -668,10 +677,11 @@ 
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
-					$top_level_pages[] = $page;
-				else
-					$children_pages[ $page->post_parent ][] = $page;
+				if ( 0 == $page->post_parent ) {
+									$top_level_pages[] = $page;
+				} else {
+									$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
@@ -683,8 +693,9 @@ 
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			if ( $count >= $start ) {
 				$to_display[$page->ID] = $level;
@@ -692,16 +703,18 @@ 
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if ( isset( $children_pages ) ) {
+							$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
-						break;
+					if ( $count >= $end ) {
+											break;
+					}
 
 					if ( $count >= $start ) {
 						$to_display[$op->ID] = 0;
@@ -741,15 +754,17 @@ 
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
-			return;
+		if ( ! isset( $children_pages[$parent] ) ) {
+					return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
@@ -764,8 +779,9 @@ 
 
 					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
-						break;
+					if ( !$my_parent->post_parent ) {
+											break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
@@ -1317,10 +1333,11 @@ 
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
-				$hierarchical_taxonomies[] = $taxonomy;
-			else
-				$flat_taxonomies[] = $taxonomy;
+			if ( $taxonomy->hierarchical ) {
+							$hierarchical_taxonomies[] = $taxonomy;
+			} else {
+							$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
 		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
@@ -1350,10 +1367,13 @@ 
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e( 'Title' );
+}
+?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
@@ -1386,8 +1406,9 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ( $bulk ) {
+									$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				}
 
 				if ( $authors = wp_dropdown_users( $users_opt ) ) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
@@ -1398,7 +1419,9 @@ 
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( !$bulk ) {
+	echo $authors_dropdown;
+}
 	endif; // post_type_supports author
 
 	if ( !$bulk && $can_publish ) :
@@ -1447,8 +1470,9 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+					echo $authors_dropdown;
+		}
 
 		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
@@ -1466,8 +1490,9 @@ 
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ( $bulk ) {
+					$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		}
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1558,13 +1583,16 @@ 
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 				</label>
 			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 				<label class="alignleft">
@@ -1609,11 +1637,14 @@ 
 					</select>
 				</label>
 
-	<?php	else : // $bulk ?>
+	<?php	else {
+	: // $bulk ?>
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1655,8 +1686,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			if ( $bulk ) {
 

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

Braces +71 added lines, -48 removed lines

@@ -39,11 +39,13 @@ 
 		) );
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
-			$status = $_REQUEST['plugin_status'];
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
+					$status = $_REQUEST['plugin_status'];
+		}
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if ( isset($_REQUEST['s']) ) {
+					$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		}
 
 		$page = $this->get_pagenum();
 	}
@@ -123,8 +125,9 @@ 
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-				$plugins['dropins'] = get_dropins();
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) {
+							$plugins['dropins'] = get_dropins();
+			}
 
 			if ( current_user_can( 'update_plugins' ) ) {
 				$current = get_site_transient( 'update_plugins' );
@@ -232,11 +235,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $plugins as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
@@ -260,8 +265,9 @@ 
 
 		$start = ( $page - 1 ) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ( $total_this_page > $plugins_per_page ) {
+					$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -300,8 +306,9 @@ 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
 		if ( 'DESC' === $order ) {
 			return strcasecmp( $b, $a );
@@ -326,10 +333,11 @@ 
 			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
-		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+		} elseif ( ! empty( $plugins['all'] ) ) {
+					_e( 'No plugins found.' );
+		} else {
+					_e( 'You do not appear to have any plugins available at this time.' );
+		}
 	}
 
 	/**
@@ -365,8 +373,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -414,17 +423,21 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ( 'active' != $status ) {
+					$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		}
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ( 'inactive' != $status && 'recent' != $status ) {
+					$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		}
 
 		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_plugins' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -437,8 +450,9 @@ 
 	public function bulk_actions( $which = '' ) {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
 		parent::bulk_actions( $which );
 	}
@@ -450,8 +464,9 @@ 
 	protected function extra_tablenav( $which ) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
-			return;
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) {
+					return;
+		}
 
 		echo '<div class="alignleft actions">';
 
@@ -475,8 +490,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
-			return 'clear-recent-list';
+		if ( isset($_POST['clear-recent-list']) ) {
+					return 'clear-recent-list';
+		}
 
 		return parent::current_action();
 	}
@@ -488,11 +504,13 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
+					$this->single_row( array( $plugin_file, $plugin_data ) );
+		}
 	}
 
 	/**
@@ -528,8 +546,9 @@ 
 		} elseif ( 'dropins' === $context ) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
+			if ( $plugin_file != $plugin_data['Name'] ) {
+							$plugin_name .= '<br/>' . $plugin_data['Name'];
+			}
 			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
 				$is_active = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
@@ -545,8 +564,9 @@ 
 						'<code>wp-config.php</code>'
 					) . '</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ( $plugin_data['Description'] ) {
+							$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			}
 		} else {
 			if ( $screen->in_admin( 'network' ) ) {
 				$is_active = is_plugin_active_for_network( $plugin_file );
@@ -696,8 +716,9 @@ 
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
+					$class .= ' update';
+		}
 
 		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
 		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
@@ -731,12 +752,14 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					if ( !empty( $plugin_data['Version'] ) ) {
+											$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					}
 					if ( !empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						if ( !empty( $plugin_data['AuthorURI'] ) ) {
+													$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						}
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
 

src/wp-admin/includes/nav-menu.php

Braces +82 added lines, -45 removed lines

@@ -75,8 +75,9 @@ 
 				'post_type' => $matches[2],
 				's' => $query,
 			));
-			if ( ! have_posts() )
-				return;
+			if ( ! have_posts() ) {
+							return;
+			}
 			while ( have_posts() ) {
 				the_post();
 				if ( 'markup' == $response_format ) {
@@ -98,8 +99,9 @@ 
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
-				return;
+			if ( empty( $terms ) || is_wp_error( $terms ) ) {
+							return;
+			}
 			foreach ( (array) $terms as $term ) {
 				if ( 'markup' == $response_format ) {
 					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
@@ -151,8 +153,9 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
-		return;
+	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) {
+			return;
+	}
 
 	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
 	$hidden_meta_boxes = array();
@@ -181,8 +184,9 @@ 
 function wp_nav_menu_post_type_meta_boxes() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( ! $post_types )
-		return;
+	if ( ! $post_types ) {
+			return;
+	}
 
 	foreach ( $post_types as $post_type ) {
 		/**
@@ -215,8 +219,9 @@ 
 function wp_nav_menu_taxonomy_meta_boxes() {
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( !$taxonomies )
-		return;
+	if ( !$taxonomies ) {
+			return;
+	}
 
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
@@ -241,8 +246,9 @@ 
 function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
-		return false;
+	if ( $one_theme_location_no_menus ) {
+			return false;
+	}
 
 	return disabled( $nav_menu_selected_id, 0 );
 }
@@ -316,8 +322,9 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $post_type['args']->_default_query ) )
-		$args = array_merge($args, (array) $post_type['args']->_default_query );
+	if ( isset( $post_type['args']->_default_query ) ) {
+			$args = array_merge($args, (array) $post_type['args']->_default_query );
+	}
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
@@ -374,17 +381,26 @@ 
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
 					<?php _e( 'Most Recent' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#<?php echo $post_type_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 					<?php _e( 'Search'); ?>
 				</a>
 			</li>
@@ -649,17 +665,26 @@ 
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
 					<?php _e( 'Most Used' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
@@ -884,8 +909,9 @@ 
 		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if ( empty($menu_items) ) {
+					return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		}
 
 		/**
 		 * Filter the Walker class used when adding nav menu items.
@@ -910,17 +936,21 @@ 
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
 		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
-				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
-				$some_invalid_menu_items = true;
+			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
+							$some_pending_menu_items = true;
+			}
+			if ( ! empty( $menu_item->_invalid ) ) {
+							$some_invalid_menu_items = true;
+			}
 		}
 
-		if ( $some_pending_menu_items )
-			$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		if ( $some_pending_menu_items ) {
+					$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		}
 
-		if ( $some_invalid_menu_items )
-			$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		if ( $some_invalid_menu_items ) {
+					$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
 		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
@@ -966,9 +996,10 @@ 
 	// Delete orphaned draft menu items.
 	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
-}
+	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
+			wp_delete_post( $menu_item_id, true );
+	}
+	}
 
 /**
  * Saves nav menu items
@@ -984,8 +1015,9 @@ 
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
-		$menu_items[$_item->db_id] = $_item;
+	foreach ( $unsorted_menu_items as $_item ) {
+			$menu_items[$_item->db_id] = $_item;
+	}
 
 	$post_fields = array(
 		'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
@@ -1000,12 +1032,14 @@ 
 		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
-				continue;
+			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
+							continue;
+			}
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ( $post_fields as $field ) {
+							$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			}
 
 			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
@@ -1029,14 +1063,17 @@ 
 	// Store 'auto-add' pages.
 	$auto_add = ! empty( $_POST['auto-add-pages'] );
 	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
-		$nav_menu_option['auto_add'] = array();
+	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
+			$nav_menu_option['auto_add'] = array();
+	}
 	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
-			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+					$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		}
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+					unset( $nav_menu_option['auto_add'][$key] );
+		}
 	}
 	// Remove nonexistent/deleted menus
 	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );

src/wp-admin/includes/file.php

Braces +213 added lines, -122 removed lines

@@ -118,23 +118,27 @@ 
  * @return bool|array False on failure, Else array of files
  */
 function list_files( $folder = '', $levels = 100 ) {
-	if ( empty($folder) )
-		return false;
+	if ( empty($folder) ) {
+			return false;
+	}
 
-	if ( ! $levels )
-		return false;
+	if ( ! $levels ) {
+			return false;
+	}
 
 	$files = array();
 	if ( $dir = @opendir( $folder ) ) {
 		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
-				continue;
+			if ( in_array($file, array('.', '..') ) ) {
+							continue;
+			}
 			if ( is_dir( $folder . '/' . $file ) ) {
 				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if ( $files2 )
-					$files = array_merge($files, $files2 );
-				else
-					$files[] = $folder . '/' . $file . '/';
+				if ( $files2 ) {
+									$files = array_merge($files, $files2 );
+				} else {
+									$files[] = $folder . '/' . $file . '/';
+				}
 			} else {
 				$files[] = $folder . '/' . $file;
 			}
@@ -205,8 +209,9 @@ 
 function validate_file_to_edit( $file, $allowed_files = '' ) {
 	$code = validate_file( $file, $allowed_files );
 
-	if (!$code )
-		return $file;
+	if (!$code ) {
+			return $file;
+	}
 
 	switch ( $code ) {
 		case 1 :
@@ -480,12 +485,14 @@ 
  */
 function download_url( $url, $timeout = 300 ) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
-		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	if ( ! $url ) {
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	}
 
 	$tmpfname = wp_tempnam($url);
-	if ( ! $tmpfname )
-		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	if ( ! $tmpfname ) {
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	}
 
 	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
 
@@ -521,17 +528,20 @@ 
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
 function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = base64_decode( $expected_md5 );
-	else
-		return false; // unknown format
+	if ( 32 == strlen( $expected_md5 ) ) {
+			$expected_raw_md5 = pack( 'H*', $expected_md5 );
+	} elseif ( 24 == strlen( $expected_md5 ) ) {
+			$expected_raw_md5 = base64_decode( $expected_md5 );
+	} else {
+			return false;
+	}
+	// unknown format
 
 	$file_md5 = md5_file( $filename, true );
 
-	if ( $file_md5 === $expected_raw_md5 )
-		return true;
+	if ( $file_md5 === $expected_raw_md5 ) {
+			return true;
+	}
 
 	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
 }
@@ -554,8 +564,9 @@ 
 function unzip_file($file, $to) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! $wp_filesystem || !is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
 	// Unzip can use a lot of memory, but not this much hopefully
 	/** This filter is documented in wp-admin/admin.php */
@@ -568,17 +579,22 @@ 
 	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
 		$path = preg_split('![/\\\]!', untrailingslashit($to));
 		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
-				continue;
+			if ( empty($path[$i]) ) {
+							continue;
+			}
 
 			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			if ( preg_match('!^[a-z]:$!i', $dir) ) {
+				// Skip it if it looks like a Windows Drive letter.
 				continue;
+			}
 
-			if ( ! $wp_filesystem->is_dir($dir) )
-				$needed_dirs[] = $dir;
-			else
-				break; // A folder exists, therefor, we dont need the check the levels below this
+			if ( ! $wp_filesystem->is_dir($dir) ) {
+							$needed_dirs[] = $dir;
+			} else {
+							break;
+			}
+			// A folder exists, therefor, we dont need the check the levels below this
 		}
 	}
 
@@ -594,8 +610,9 @@ 
 		if ( true === $result ) {
 			return $result;
 		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
-				return $result;
+			if ( 'incompatible_archive' != $result->get_error_code() ) {
+							return $result;
+			}
 		}
 	}
 	// Fall through to PclZip if ZipArchive is not available, or encountered an error opening the file.
@@ -623,24 +640,30 @@ 
 	$z = new ZipArchive();
 
 	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
-		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	if ( true !== $zopen ) {
+			return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	}
 
 	$uncompressed_size = 0;
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		if ( ! $info = $z->statIndex($i) ) {
+					return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) {
+			// Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $info['size'];
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr($info['name'], -1) ) {
+			// directory
 			$needed_dirs[] = $to . untrailingslashit($info['name']);
-		else
-			$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+		} else {
+					$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+		}
 	}
 
 	/*
@@ -650,17 +673,22 @@ 
 	 */
 	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
+					return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		}
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if ( untrailingslashit($to) == $dir ) {
+			// Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		}
+		if ( strpos($dir, $to) === false ) {
+			// If the directory is not within the working directory, Skip it
 			continue;
+		}
 
 		$parent_folder = dirname($dir);
 		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
@@ -680,21 +708,28 @@ 
 	unset($needed_dirs);
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		if ( ! $info = $z->statIndex($i) ) {
+					return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr($info['name'], -1) ) {
+			// directory
 			continue;
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) {
+			// Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
 		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
-			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		if ( false === $contents ) {
+					return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) ) {
+					return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		}
 	}
 
 	$z->close();
@@ -731,18 +766,22 @@ 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
-		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	if ( !is_array($archive_files) ) {
+			return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	}
 
-	if ( 0 == count($archive_files) )
-		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	if ( 0 == count($archive_files) ) {
+			return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	}
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
 	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) {
+			// Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $file['size'];
 
@@ -756,17 +795,22 @@ 
 	 */
 	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
+					return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		}
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if ( untrailingslashit($to) == $dir ) {
+			// Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		}
+		if ( strpos($dir, $to) === false ) {
+			// If the directory is not within the working directory, Skip it
 			continue;
+		}
 
 		$parent_folder = dirname($dir);
 		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
@@ -779,21 +823,26 @@ 
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
+					return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		}
 	}
 	unset($needed_dirs);
 
 	// Extract the files from the zip
 	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
-			continue;
+		if ( $file['folder'] ) {
+					continue;
+		}
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) {
+			// Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) ) {
+					return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		}
 	}
 	return true;
 }
@@ -820,32 +869,37 @@ 
 	$to = trailingslashit($to);
 
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
-			continue;
+		if ( in_array( $filename, $skip_list ) ) {
+					continue;
+		}
 
 		if ( 'f' == $fileinfo['type'] ) {
 			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+									return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				}
 			}
 		} elseif ( 'd' == $fileinfo['type'] ) {
 			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) ) {
+									return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				}
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
+									$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				}
 			}
 
 			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
-				return $result;
+			if ( is_wp_error($result) ) {
+							return $result;
+			}
 		}
 	}
 	return true;
@@ -875,8 +929,9 @@ 
 
 	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
 
-	if ( ! $method )
-		return false;
+	if ( ! $method ) {
+			return false;
+	}
 
 	if ( ! class_exists( "WP_Filesystem_$method" ) ) {
 
@@ -892,8 +947,9 @@ 
 		 */
 		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
 
-		if ( ! file_exists($abstraction_file) )
-			return;
+		if ( ! file_exists($abstraction_file) ) {
+					return;
+		}
 
 		require_once($abstraction_file);
 	}
@@ -902,22 +958,29 @@ 
 	$wp_filesystem = new $method($args);
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
-		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
-		define('FS_TIMEOUT', 30);
+	if ( ! defined('FS_CONNECT_TIMEOUT') ) {
+			define('FS_CONNECT_TIMEOUT', 30);
+	}
+	if ( ! defined('FS_TIMEOUT') ) {
+			define('FS_TIMEOUT', 30);
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return false;
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return false;
+	}
 
-	if ( !$wp_filesystem->connect() )
-		return false; //There was an error connecting to the server.
+	if ( !$wp_filesystem->connect() ) {
+			return false;
+	}
+	//There was an error connecting to the server.
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined('FS_CHMOD_DIR') ) {
+			define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
+	}
+	if ( ! defined('FS_CHMOD_FILE') ) {
+			define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	}
 
 	return true;
 }
@@ -992,9 +1055,16 @@ 
 		}
  	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) {
+		$method = 'ssh2';
+	}
+	if ( ! $method && extension_loaded('ftp') ) {
+		$method = 'ftpext';
+	}
+	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) {
+		$method = 'ftpsockets';
+	}
+	//Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
 	/**
 	 * Filter the filesystem method to use.
@@ -1061,18 +1131,21 @@ 
 	 * @param array  $extra_fields                 Extra POST fields.
 	 */
 	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
-		return $req_cred;
+	if ( '' !== $req_cred ) {
+			return $req_cred;
+	}
 
 	if ( empty($type) ) {
 		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
 	}
 
-	if ( 'direct' == $type )
-		return true;
+	if ( 'direct' == $type ) {
+			return true;
+	}
 
-	if ( is_null( $extra_fields ) )
-		$extra_fields = array( 'version', 'locale' );
+	if ( is_null( $extra_fields ) ) {
+			$extra_fields = array( 'version', 'locale' );
+	}
 
 	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
 
@@ -1090,8 +1163,9 @@ 
 
 	if ( strpos($credentials['hostname'], ':') ) {
 		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
-			unset($credentials['port']);
+		if ( ! is_numeric($credentials['port']) ) {
+					unset($credentials['port']);
+		}
 	} else {
 		unset($credentials['port']);
 	}
@@ -1111,8 +1185,10 @@ 
 				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
 			) ) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
+		if ( !empty($stored_credentials['port']) ) {
+			//save port as part of hostname to simplify above code.
 			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		}
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
 		if ( ! wp_installing() ) {
@@ -1129,18 +1205,23 @@ 
 
 	if ( $error ) {
 		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = esc_html( $error->get_error_message() );
+		if ( is_wp_error($error) ) {
+					$error_string = esc_html( $error->get_error_message() );
+		}
 		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
+	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') ) {
+			$types[ 'ftp' ] = __('FTP');
+	}
+	if ( extension_loaded('ftp') ) {
+		//Only this supports FTPS
 		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	}
+	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) {
+			$types[ 'ssh' ] = __('SSH2');
+	}
 
 	/**
 	 * Filter the connection types to output to the filesystem credentials form.
@@ -1201,7 +1282,10 @@ 
 ?></p>
 <label for="hostname">
 	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) {
+	echo ":$port";
+}
+?>"<?php disabled( defined('FTP_HOST') ); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
@@ -1212,8 +1296,14 @@ 
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) {
+	echo '*****';
+}
+?>"<?php disabled( defined('FTP_PASS') ); ?> />
+		<em><?php if ( ! defined('FTP_PASS') ) {
+	_e( 'This password will not be stored on the server.' );
+}
+?></em>
 	</label>
 </div>
 <?php if ( isset($types['ssh']) ) : ?>
@@ -1243,9 +1333,10 @@ 
 </fieldset>
 <?php
 foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $_POST[ $field ] ) )
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
-}
+	if ( isset( $_POST[ $field ] ) ) {
+			echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+	}
+	}
 ?>
 	<p class="request-filesystem-credentials-action-buttons">
 		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>

src/wp-admin/includes/post.php

Braces +306 added lines, -216 removed lines

@@ -20,37 +20,45 @@ 
  */
 function _wp_translate_postdata( $update = false, $post_data = null ) {
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( $update )
-		$post_data['ID'] = (int) $post_data['post_ID'];
+	if ( $update ) {
+			$post_data['ID'] = (int) $post_data['post_ID'];
+	}
 
 	$ptype = get_post_type_object( $post_data['post_type'] );
 
 	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+		}
 	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+		}
 	}
 
-	if ( isset( $post_data['content'] ) )
-		$post_data['post_content'] = $post_data['content'];
+	if ( isset( $post_data['content'] ) ) {
+			$post_data['post_content'] = $post_data['content'];
+	}
 
-	if ( isset( $post_data['excerpt'] ) )
-		$post_data['post_excerpt'] = $post_data['excerpt'];
+	if ( isset( $post_data['excerpt'] ) ) {
+			$post_data['post_excerpt'] = $post_data['excerpt'];
+	}
 
-	if ( isset( $post_data['parent_id'] ) )
-		$post_data['post_parent'] = (int) $post_data['parent_id'];
+	if ( isset( $post_data['parent_id'] ) ) {
+			$post_data['post_parent'] = (int) $post_data['parent_id'];
+	}
 
-	if ( isset($post_data['trackback_url']) )
-		$post_data['to_ping'] = $post_data['trackback_url'];
+	if ( isset($post_data['trackback_url']) ) {
+			$post_data['to_ping'] = $post_data['trackback_url'];
+	}
 
 	$post_data['user_ID'] = get_current_user_id();
 
@@ -67,15 +75,17 @@ 
 	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
 		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
 		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+			}
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			}
 		}
 	}
 
@@ -93,21 +103,27 @@ 
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
-		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
-		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
-		$post_data['post_status'] = 'pending';
-
-	if ( isset( $post_data['ID'] ) )
-		$post_id = $post_data['ID'];
-	else
-		$post_id = false;
+	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] ) {
+			$post_data['post_status'] = 'private';
+	}
+	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) ) {
+			$post_data['post_status'] = 'publish';
+	}
+	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['pending']) && '' != $post_data['pending'] ) {
+			$post_data['post_status'] = 'pending';
+	}
+
+	if ( isset( $post_data['ID'] ) ) {
+			$post_id = $post_data['ID'];
+	} else {
+			$post_id = false;
+	}
 	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 
 	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
@@ -118,9 +134,10 @@ 
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) ) {
+			if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
 			$post_data['post_status'] = 'pending';
+	}
 
 	if ( ! isset( $post_data['post_status'] ) ) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
@@ -130,11 +147,13 @@ 
 		unset( $post_data['post_password'] );
 	}
 
-	if (!isset( $post_data['comment_status'] ))
-		$post_data['comment_status'] = 'closed';
+	if (!isset( $post_data['comment_status'] )) {
+			$post_data['comment_status'] = 'closed';
+	}
 
-	if (!isset( $post_data['ping_status'] ))
-		$post_data['ping_status'] = 'closed';
+	if (!isset( $post_data['ping_status'] )) {
+			$post_data['ping_status'] = 'closed';
+	}
 
 	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
@@ -181,8 +200,9 @@ 
 function edit_post( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
 	// Clear out any data in internal vars.
 	unset( $post_data['filter'] );
@@ -202,10 +222,11 @@ 
 
 	$ptype = get_post_type_object($post_data['post_type']);
 	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('You are not allowed to edit this page.' ));
-		else
-			wp_die( __('You are not allowed to edit this post.' ));
+		if ( 'page' == $post_data['post_type'] ) {
+					wp_die( __('You are not allowed to edit this page.' ));
+		} else {
+					wp_die( __('You are not allowed to edit this post.' ));
+		}
 	}
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
@@ -213,8 +234,9 @@ 
 		$revision = current( $revisions );
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
+					_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		}
 	}
 
 	if ( isset($post_data['visibility']) ) {
@@ -234,18 +256,21 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	if ( is_wp_error($post_data) ) {
+			wp_die( $post_data->get_error_message() );
+	}
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if ( isset( $post_data['post_format'] ) ) {
+			set_post_format( $post_ID, $post_data['post_format'] );
+	}
 
 	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
 	foreach ( $format_meta_urls as $format_meta_url ) {
 		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		if ( isset( $post_data[ $keyed ] ) ) {
+					update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		}
 	}
 
 	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
@@ -253,10 +278,11 @@ 
 	foreach ( $format_keys as $key ) {
 		$keyed = '_format_' . $key;
 		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
-			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			if ( current_user_can( 'unfiltered_html' ) ) {
+							update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+			} else {
+							update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			}
 		}
 	}
 
@@ -277,24 +303,30 @@ 
 	// Meta Stuff
 	if ( isset($post_data['meta']) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
+							continue;
+			}
 			update_meta( $key, $value['key'], $value['value'] );
 		}
 	}
 
 	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
 		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
+							continue;
+			}
 			delete_meta( $key );
 		}
 	}
@@ -386,10 +418,11 @@ 
 	wp_set_post_lock( $post_ID );
 
 	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
-		else
-			unstick_post( $post_ID );
+		if ( ! empty( $post_data['sticky'] ) ) {
+					stick_post( $post_ID );
+		} else {
+					unstick_post( $post_ID );
+		}
 	}
 
 	return $post_ID;
@@ -411,19 +444,22 @@ 
 function bulk_edit_posts( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( isset($post_data['post_type']) )
-		$ptype = get_post_type_object($post_data['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($post_data['post_type']) ) {
+			$ptype = get_post_type_object($post_data['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('You are not allowed to edit pages.'));
-		else
-			wp_die( __('You are not allowed to edit posts.'));
+		if ( 'page' == $ptype->name ) {
+					wp_die( __('You are not allowed to edit pages.'));
+		} else {
+					wp_die( __('You are not allowed to edit posts.'));
+		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -452,28 +488,32 @@ 
 	);
 
 	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
-			unset($post_data[$field]);
+		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) {
+					unset($post_data[$field]);
+		}
 	}
 
 	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
-		else
-			unset($post_data['post_category']);
+		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) ) {
+					$new_cats = array_map( 'absint', $post_data['post_category'] );
+		} else {
+					unset($post_data['post_category']);
+		}
 	}
 
 	$tax_input = array();
 	if ( isset($post_data['tax_input'])) {
 		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
-				continue;
+			if ( empty($terms) ) {
+							continue;
+			}
 			if ( is_taxonomy_hierarchical( $tax_name ) ) {
 				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
 			} else {
 				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
+				if ( ',' !== $comma ) {
+									$terms = str_replace( $comma, ',', $terms );
+				}
 				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
 			}
 		}
@@ -518,15 +558,17 @@ 
 		$tax_names = get_object_taxonomies( $post );
 		foreach ( $tax_names as $tax_name ) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
-				$new_terms = $tax_input[$tax_name];
-			else
-				$new_terms = array();
+			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
+							$new_terms = $tax_input[$tax_name];
+			} else {
+							$new_terms = array();
+			}
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
-			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			if ( $taxonomy_obj->hierarchical ) {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			} else {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			}
 
 			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
 		}
@@ -559,14 +601,16 @@ 
 		$updated[] = wp_update_post( $post_data );
 
 		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
-			else
-				unstick_post( $post_ID );
+			if ( 'sticky' == $post_data['sticky'] ) {
+							stick_post( $post_ID );
+			} else {
+							unstick_post( $post_ID );
+			}
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if ( isset( $post_data['post_format'] ) ) {
+					set_post_format( $post_ID, $post_data['post_format'] );
+		}
 	}
 
 	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
@@ -583,22 +627,26 @@ 
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( !empty( $_REQUEST['post_title'] ) ) {
+			$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	}
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( !empty( $_REQUEST['content'] ) ) {
+			$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	}
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	if ( !empty( $_REQUEST['excerpt'] ) ) {
+			$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	}
 
 	if ( $create_in_db ) {
 		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
 		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) ) {
+					set_post_format( $post, get_option( 'default_post_format' ) );
+		}
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -691,8 +739,9 @@ 
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( !empty ( $args ) ) {
+			return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	}
 
 	return 0;
 }
@@ -707,16 +756,18 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
-		$ptype = get_post_type_object($_POST['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($_POST['post_type']) ) {
+			$ptype = get_post_type_object($_POST['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
-		else
-			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+		if ( 'page' == $ptype->name ) {
+					return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+		} else {
+					return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+		}
 	}
 
 	$_POST['post_mime_type'] = '';
@@ -725,8 +776,9 @@ 
 	unset( $_POST['filter'] );
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
-		return edit_post();
+	if ( isset( $_POST['post_ID'] ) ) {
+			return edit_post();
+	}
 
 	if ( isset($_POST['visibility']) ) {
 		switch ( $_POST['visibility'] ) {
@@ -745,16 +797,19 @@ 
 	}
 
 	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
-		return $translated;
+	if ( is_wp_error($translated) ) {
+			return $translated;
+	}
 
 	// Create the post.
 	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
-		return $post_ID;
+	if ( is_wp_error( $post_ID ) ) {
+			return $post_ID;
+	}
 
-	if ( empty($post_ID) )
-		return 0;
+	if ( empty($post_ID) ) {
+			return 0;
+	}
 
 	add_meta( $post_ID );
 
@@ -777,11 +832,12 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
-	else
-		return $result;
-}
+	if ( is_wp_error( $result ) ) {
+			wp_die( $result->get_error_message() );
+	} else {
+			return $result;
+	}
+	}
 
 //
 // Post Meta
@@ -801,22 +857,27 @@ 
 	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
 	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if ( is_string( $metavalue ) ) {
+			$metavalue = trim( $metavalue );
+	}
 
 	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
-			$metakey = $metakeyselect;
+ 		if ( '#NONE#' != $metakeyselect ) {
+ 					$metakey = $metakeyselect;
+ 		}
 
-		if ( $metakeyinput )
-			$metakey = $metakeyinput; // default
+		if ( $metakeyinput ) {
+					$metakey = $metakeyinput;
+		}
+		// default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
-			return false;
+		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
+					return false;
+		}
 
 		$metakey = wp_slash( $metakey );
 
@@ -924,12 +985,14 @@ 
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
-		return;
+	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) ) {
+			return;
+	}
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
-		return;
+	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
+			return;
+	}
 
 	$site_url = get_bloginfo('url');
 	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
@@ -938,15 +1001,17 @@ 
 	foreach ( $link_matches[1] as $key => $value ) {
 		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
 			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
-				continue;
+			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) ) {
+						continue;
+		}
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
-			continue;
+		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false ) {
+					continue;
+		}
 
 		$link = $link_matches[0][$key];
 		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
@@ -986,16 +1051,18 @@ 
  * @return array
  */
 function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
-		$q = $_GET;
+	if ( false === $q ) {
+			$q = $_GET;
+	}
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$post_stati  = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
-		$post_type = $q['post_type'];
-	else
-		$post_type = 'post';
+	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) ) {
+			$post_type = $q['post_type'];
+	} else {
+			$post_type = 'post';
+	}
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
@@ -1018,8 +1085,9 @@ 
 
 	$per_page = "edit_{$post_type}_per_page";
 	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
-		$posts_per_page = 20;
+	if ( empty( $posts_per_page ) || $posts_per_page < 1 ) {
+			$posts_per_page = 20;
+	}
 
 	/**
 	 * Filter the number of items per page to show for a specific 'per_page' type.
@@ -1057,8 +1125,9 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty( $q['show_sticky'] ) ) {
+			$query['post__in'] = (array) get_option( 'sticky_posts' );
+	}
 
 	wp( $query );
 
@@ -1206,8 +1275,9 @@ 
  */
 function get_sample_permalink($id, $title = null, $name = null) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	if ( ! $post ) {
+			return array( '', '' );
+	}
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1223,8 +1293,9 @@ 
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
-		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	if ( !is_null($name) ) {
+			$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	}
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
 
@@ -1246,8 +1317,9 @@ 
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
 		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
-			$uri .= '/';
+		if ( !empty($uri) ) {
+					$uri .= '/';
+		}
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
@@ -1284,8 +1356,9 @@ 
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return '';
+	if ( ! $post ) {
+			return '';
+	}
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
@@ -1445,11 +1518,13 @@ 
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
 function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
-		return false;
+	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) ) {
+			return false;
+	}
 
 	$lock = explode( ':', $lock );
 	$time = $lock[0];
@@ -1458,8 +1533,9 @@ 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
 	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
-		return $user;
+	if ( $time && $time > time() - $time_window && $user != get_current_user_id() ) {
+			return $user;
+	}
 	return false;
 }
 
@@ -1473,10 +1549,12 @@ 
  * 	an array of the lock time and the user ID.
  */
 function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( 0 == ($user_id = get_current_user_id()) ) {
+			return false;
+	}
 
 	$now = time();
 	$lock = "$now:$user_id";
@@ -1492,12 +1570,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
-		return;
+	if ( ! $post = get_post() ) {
+			return;
+	}
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if (  $user_id = wp_check_post_lock( $post->ID ) ) {
+			$user = get_userdata( $user_id );
+	}
 
 	if ( $user ) {
 
@@ -1511,8 +1591,9 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
-			return;
+		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) {
+					return;
+		}
 
 		$locked = true;
 	} else {
@@ -1526,8 +1607,9 @@ 
 	} else {
 		$sendback = admin_url( 'edit.php' );
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ( 'post' != $post->post_type ) {
+					$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		}
 
 		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
 	}
@@ -1574,8 +1656,9 @@ 
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
 			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			if ( $override ) {
+							printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			}
 		?>
 		</p>
 		<?php
@@ -1655,8 +1738,9 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
-		return $post_data;
+	if ( is_wp_error( $post_data ) ) {
+			return $post_data;
+	}
 
 	$post_author = get_current_user_id();
 
@@ -1728,14 +1812,16 @@ 
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
-			$_POST['post_status'] = 'draft';
+		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) {
+					$_POST['post_status'] = 'draft';
+		}
 
 		$saved_post_id = wp_create_post_autosave( $post->ID );
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if ( is_wp_error( $saved_post_id ) ) {
+			wp_die( $saved_post_id->get_error_message() );
+	}
 
 	$query_args = array();
 
@@ -1743,8 +1829,9 @@ 
 		$query_args['preview_id'] = $post->ID;
 		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 
-		if ( isset( $_POST['post_format'] ) )
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if ( isset( $_POST['post_format'] ) ) {
+					$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		}
 	}
 
 	return get_preview_post_link( $post, $query_args );
@@ -1763,8 +1850,9 @@ 
  */
 function wp_autosave( $post_data ) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined( 'DOING_AUTOSAVE' ) ) {
+			define( 'DOING_AUTOSAVE', true );
+	}
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
@@ -1779,11 +1867,13 @@ 
 		return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
 	}
 
-	if ( 'auto-draft' == $post->post_status )
-		$post_data['post_status'] = 'draft';
+	if ( 'auto-draft' == $post->post_status ) {
+			$post_data['post_status'] = 'draft';
+	}
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) ) {
+			$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	}
 
 	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked

src/wp-admin/includes/dashboard.php

Braces +94 added lines, -62 removed lines

@@ -28,18 +28,21 @@ 
 
 	if ( $response && $response['upgrade'] ) {
 		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
-		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		if ( $response['insecure'] ) {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+		} else {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		}
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if ( is_blog_admin() && current_user_can('edit_posts') ) {
+			wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	}
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if ( is_network_admin() ) {
+			wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	}
 
 	// Activity Widget
 	if ( is_blog_admin() ) {
@@ -163,12 +166,14 @@ 
 	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
-		$location = 'side';
+	if ( in_array($widget_id, $side_widgets) ) {
+			$location = 'side';
+	}
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
-		$priority = 'high';
+	if ( 'dashboard_browser_nag' === $widget_id ) {
+			$priority = 'high';
+	}
 
 	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
@@ -376,10 +381,12 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if ( current_user_can('create_sites') ) {
+			$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
+	}
+	if ( current_user_can('create_users') ) {
+			$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	}
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
@@ -476,8 +483,10 @@ 
 		$post = get_default_post_to_edit( 'post' , true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) ) {
+					update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID );
+		}
+		// Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
@@ -653,8 +662,9 @@ 
 			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action )
-				$action .= ' hide-if-no-js';
+			if ( 'reply' == $action || 'quickedit' == $action ) {
+							$action .= ' hide-if-no-js';
+			}
 
 			$actions_string .= "<span class='$action'>$sep$link</span>";
 		}
@@ -691,10 +701,12 @@ 
 			</p>
 
 			<?php
-			else :
+			else {
+				:
 				switch ( $comment->comment_type ) {
 					case 'pingback' :
 						$type = __( 'Pingback' );
+			}
 						break;
 					case 'trackback' :
 						$type = __( 'Trackback' );
@@ -883,19 +895,22 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
-		$comments_query['status'] = 'approve';
+	if ( ! current_user_can( 'edit_posts' ) ) {
+			$comments_query['status'] = 'approve';
+	}
 
 	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
 		if ( ! is_array( $possible ) ) {
 			break;
 		}
 		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
-				continue;
+			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) {
+							continue;
+			}
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
-				break 2;
+			if ( count( $comments ) == $total_items ) {
+							break 2;
+			}
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
@@ -906,8 +921,9 @@ 
 		echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ( $comments as $comment ) {
+					_wp_dashboard_recent_comments_row( $comment );
+		}
 		echo '</ul>';
 
 		if ( current_user_can( 'edit_posts' ) ) {
@@ -1023,11 +1039,13 @@ 
  * @param array $form_inputs
  */
 function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
-		$widget_options = array();
+	if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) {
+			$widget_options = array();
+	}
 
-	if ( !isset($widget_options[$widget_id]) )
-		$widget_options[$widget_id] = array();
+	if ( !isset($widget_options[$widget_id]) ) {
+			$widget_options[$widget_id] = array();
+	}
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
@@ -1197,16 +1215,18 @@ 
 	echo '<ul>';
 
 	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-			continue;
+		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() ) {
+					continue;
+		}
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin
 		while ( true ) {
 			// Abort this foreach loop iteration if there's no plugins left of this type
-			if ( 0 == count($items) )
-				continue 2;
+			if ( 0 == count($items) ) {
+							continue 2;
+			}
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
@@ -1214,9 +1234,9 @@ 
 			list($link, $frag) = explode( '#', $item->get_link() );
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-				$slug = $matches[1];
-			else {
+			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) {
+							$slug = $matches[1];
+			} else {
 				unset( $items[$item_key] );
 				continue;
 			}
@@ -1235,11 +1255,13 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-			unset($items[$item_key]);
+		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) {
+					unset($items[$item_key]);
+		}
 
-		if ( !isset($items[$item_key]) )
-			continue;
+		if ( !isset($items[$item_key]) ) {
+					continue;
+		}
 
 		$raw_title = $item->get_title();
 
@@ -1266,16 +1288,18 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
  */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
-		$percentused = '100';
-	else
-		$percentused = ( $used / $quota ) * 100;
+	if ( $used > $quota ) {
+			$percentused = '100';
+	} else {
+			$percentused = ( $used / $quota ) * 100;
+	}
 	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
 	$used = round( $used, 2 );
 	$percentused = number_format( $percentused );
@@ -1344,8 +1368,9 @@ 
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ( 'en_US' !== $locale ) {
+					$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		}
 
 		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
 		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
@@ -1372,8 +1397,9 @@ 
 function dashboard_browser_nag_class( $classes ) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
-		$classes[] = 'browser-insecure';
+	if ( $response && $response['insecure'] ) {
+			$classes[] = 'browser-insecure';
+	}
 
 	return $classes;
 }
@@ -1388,8 +1414,9 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
-		return false;
+	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
+			return false;
+	}
 
 	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
 
@@ -1403,8 +1430,9 @@ 
 
 		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+					return false;
+		}
 
 		/**
 		 * Response should be an array with:
@@ -1419,8 +1447,9 @@ 
 		 */
 		$response = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $response ) )
-			return false;
+		if ( ! is_array( $response ) ) {
+					return false;
+		}
 
 		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
 	}
@@ -1464,8 +1493,11 @@ 
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php else {
+	: ?>
+			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) );
+}
+?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 		<?php endif; ?>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>