Index: wp-admin/includes/meta-boxes.php =================================================================== --- wp-admin/includes/meta-boxes.php (revision 46881) +++ wp-admin/includes/meta-boxes.php (working copy) @@ -462,7 +462,7 @@ if ( ! $post_format ) { $post_format = '0'; } - // Add in the current one if it isn't there yet, in case the current theme doesn't support it + // Add in the current one if it isn't there yet, in case the current theme doesn't support it. if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) { $post_formats[0][] = $post_format; } @@ -941,8 +941,8 @@

0 && get_option( 'page_for_posts' ) != $post->ID ) : $template = ! empty( $post->page_template ) ? $post->page_template : false; @@ -1413,7 +1413,7 @@ // We should aim to show the revisions meta box only when there are revisions. if ( count( $revisions ) > 1 ) { - reset( $revisions ); // Reset pointer for key() + reset( $revisions ); // Reset pointer for key(). $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ), @@ -1440,7 +1440,7 @@ add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core', array( '__back_compat_meta_box' => true ) ); } - // all taxonomies + // All taxonomies. foreach ( get_object_taxonomies( $post ) as $tax_name ) { $taxonomy = get_taxonomy( $tax_name ); if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb ) { Index: wp-admin/includes/misc.php =================================================================== --- wp-admin/includes/misc.php (revision 46881) +++ wp-admin/includes/misc.php (working copy) @@ -178,7 +178,7 @@ $lines[] = rtrim( fgets( $fp ), "\r\n" ); } - // Split out the existing file into the preceding lines, and those that appear after the marker + // Split out the existing file into the preceding lines, and those that appear after the marker. $pre_lines = array(); $post_lines = array(); $existing_lines = array(); @@ -201,7 +201,7 @@ } } - // Check to see if there was a change + // Check to see if there was a change. if ( $existing_lines === $insertion ) { flock( $fp, LOCK_UN ); fclose( $fp ); @@ -209,7 +209,7 @@ return true; } - // Generate the new file data + // Generate the new file data. $new_file_data = implode( "\n", array_merge( @@ -221,7 +221,7 @@ ) ); - // Write to the start of the file, and truncate it to that length + // Write to the start of the file, and truncate it to that length. fseek( $fp, 0 ); $bytes = fwrite( $fp, $new_file_data ); if ( $bytes ) { @@ -296,7 +296,7 @@ $home_path = get_home_path(); $web_config_file = $home_path . 'web.config'; - // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP + // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP. if ( iis7_supports_permalinks() && ( ( ! file_exists( $web_config_file ) && win_is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable( $web_config_file ) ) ) { $rule = $wp_rewrite->iis7_url_rewrite_rules( false ); if ( ! empty( $rule ) ) { @@ -598,11 +598,11 @@ } if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) { - // If it's a function or class defined locally, there's not going to be any docs available + // If it's a function or class defined locally, there's not going to be any docs available. if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) { $ignore_functions[] = $tokens[ $t ][1]; } - // Add this to our stack of unique references + // Add this to our stack of unique references. $functions[] = $tokens[ $t ][1]; } } @@ -673,7 +673,7 @@ case 'plugins_per_page': case 'export_personal_data_requests_per_page': case 'remove_personal_data_requests_per_page': - // Network admin + // Network admin. case 'sites_network_per_page': case 'users_network_per_page': case 'site_users_network_per_page': @@ -817,13 +817,13 @@ $xpath = new DOMXPath( $doc ); - // First check if the rule already exists as in that case there is no need to re-add it + // First check if the rule already exists as in that case there is no need to re-add it. $wordpress_rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' ); if ( $wordpress_rules->length > 0 ) { return true; } - // Check the XPath to the rewrite rule and create XML nodes if they do not exist + // Check the XPath to the rewrite rule and create XML nodes if they do not exist. $xmlnodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' ); if ( $xmlnodes->length > 0 ) { $rules_node = $xmlnodes->item( 0 ); Index: wp-admin/includes/ms-admin-filters.php =================================================================== --- wp-admin/includes/ms-admin-filters.php (revision 46881) +++ wp-admin/includes/ms-admin-filters.php (working copy) @@ -10,7 +10,7 @@ // Media Hooks. add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' ); -// User Hooks +// User Hooks. add_action( 'user_admin_notices', 'new_user_email_admin_notice' ); add_action( 'network_admin_notices', 'new_user_email_admin_notice' ); @@ -19,10 +19,10 @@ // Site Hooks. add_action( 'wpmueditblogaction', 'upload_space_setting' ); -// Network hooks +// Network hooks. add_action( 'update_site_option_admin_email', 'wp_network_admin_email_change_notification', 10, 4 ); -// Taxonomy Hooks +// Taxonomy Hooks. add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 ); // Post Hooks. @@ -31,14 +31,14 @@ // Tools Hooks. add_filter( 'import_allow_create_users', 'check_import_new_users' ); -// Notices Hooks +// Notices Hooks. add_action( 'admin_notices', 'site_admin_notice' ); add_action( 'network_admin_notices', 'site_admin_notice' ); -// Update Hooks +// Update Hooks. add_action( 'network_admin_notices', 'update_nag', 3 ); add_action( 'network_admin_notices', 'maintenance_nag', 10 ); -// Network Admin Hooks +// Network Admin Hooks. add_action( 'add_site_option_new_admin_email', 'update_network_option_new_admin_email', 10, 2 ); add_action( 'update_site_option_new_admin_email', 'update_network_option_new_admin_email', 10, 2 ); Index: wp-admin/includes/ms.php =================================================================== --- wp-admin/includes/ms.php (revision 46881) +++ wp-admin/includes/ms.php (working copy) @@ -20,7 +20,7 @@ return $file; } - if ( $file['error'] != '0' ) { // there's already an error + if ( $file['error'] != '0' ) { // There's already an error. return $file; } @@ -220,7 +220,7 @@ $space_allowed = get_space_allowed(); if ( ! is_numeric( $space_allowed ) ) { - $space_allowed = 10; // Default space allowed is 10 MB + $space_allowed = 10; // Default space allowed is 10 MB. } $space_used = get_space_used(); @@ -644,11 +644,11 @@ foreach ( (array) $lang_files as $val ) { $code_lang = basename( $val, '.mo' ); - if ( $code_lang == 'en_US' ) { // American English + if ( $code_lang == 'en_US' ) { // American English. $flag = true; $ae = __( 'American English' ); $output[ $ae ] = ''; - } elseif ( $code_lang == 'en_GB' ) { // British English + } elseif ( $code_lang == 'en_GB' ) { // British English. $flag = true; $be = __( 'British English' ); $output[ $be ] = ''; @@ -658,11 +658,11 @@ } } - if ( $flag === false ) { // WordPress english + if ( $flag === false ) { // WordPress English. $output[] = ''; } - // Order by name + // Order by name. uksort( $output, 'strnatcasecmp' ); /** @@ -1067,7 +1067,7 @@ ) ); - // Parse arguments + // Parse arguments. $parsed_args = wp_parse_args( $args, array( @@ -1077,36 +1077,36 @@ ) ); - // Setup the links array + // Setup the links array. $screen_links = array(); - // Loop through tabs + // Loop through tabs. foreach ( $parsed_args['links'] as $link_id => $link ) { - // Skip link if user can't access + // Skip link if user can't access. if ( ! current_user_can( $link['cap'], $parsed_args['blog_id'] ) ) { continue; } - // Link classes + // Link classes. $classes = array( 'nav-tab' ); // Aria-current attribute. $aria_current = ''; - // Selected is set by the parent OR assumed by the $pagenow global + // Selected is set by the parent OR assumed by the $pagenow global. if ( $parsed_args['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) { $classes[] = 'nav-tab-active'; $aria_current = ' aria-current="page"'; } - // Escape each class + // Escape each class. $esc_classes = implode( ' ', $classes ); - // Get the URL for this link + // Get the URL for this link. $url = add_query_arg( array( 'id' => $parsed_args['blog_id'] ), network_admin_url( $link['url'] ) ); - // Add link to nav links + // Add link to nav links. $screen_links[ $link_id ] = '' . esc_html( $link['label'] ) . ''; } Index: wp-admin/includes/nav-menu.php =================================================================== --- wp-admin/includes/nav-menu.php (revision 46881) +++ wp-admin/includes/nav-menu.php (working copy) @@ -143,7 +143,7 @@ add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' ); wp_nav_menu_taxonomy_meta_boxes(); - // Register advanced menu items (columns) + // Register advanced menu items (columns). add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' ); // If first time editing, disable advanced items by default. @@ -422,7 +422,7 @@ } } - // @todo transient caching of these results with proper invalidation on updating of a post of this type + // @todo transient caching of these results with proper invalidation on updating of a post of this type. $get_posts = new WP_Query; $posts = $get_posts->query( $args ); @@ -1142,7 +1142,7 @@ ); $messages = array(); $menu_items = array(); - // Index menu items by db ID + // Index menu items by db ID. foreach ( $unsorted_menu_items as $_item ) { $menu_items[ $_item->db_id ] = $_item; } @@ -1164,11 +1164,11 @@ ); wp_defer_term_counting( true ); - // Loop through all the menu items' POST variables + // Loop through all the menu items' POST variables. if ( ! empty( $_POST['menu-item-db-id'] ) ) { foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) { - // Menu item title can't be blank + // Menu item title can't be blank. if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) { continue; } @@ -1188,7 +1188,7 @@ } } - // Remove menu items from the menu that weren't in $_POST + // Remove menu items from the menu that weren't in $_POST. if ( ! empty( $menu_items ) ) { foreach ( array_keys( $menu_items ) as $menu_item_id ) { if ( is_nav_menu_item( $menu_item_id ) ) { @@ -1213,7 +1213,7 @@ unset( $nav_menu_option['auto_add'][ $key ] ); } } - // Remove nonexistent/deleted menus + // Remove nonexistent/deleted menus. $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) ); update_option( 'nav_menu_options', $nav_menu_option ); Index: wp-admin/includes/network.php =================================================================== --- wp-admin/includes/network.php (revision 46881) +++ wp-admin/includes/network.php (working copy) @@ -181,7 +181,7 @@ if ( isset( $_POST['subdomain_install'] ) ) { $subdomain_install = (bool) $_POST['subdomain_install']; - } elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // assume nothing + } elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // Assume nothing. $subdomain_install = true; } elseif ( ! allow_subdirectory_install() ) { $subdomain_install = true; @@ -188,7 +188,7 @@ } else { $subdomain_install = false; $got_mod_rewrite = got_mod_rewrite(); - if ( $got_mod_rewrite ) { // dangerous assumptions + if ( $got_mod_rewrite ) { // Dangerous assumptions. echo '

' . __( 'Note:' ) . ' '; printf( /* translators: %s: mod_rewrite */ @@ -206,7 +206,7 @@ echo '

'; } - if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache) + if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache). echo '

'; printf( /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */ @@ -547,7 +547,7 @@