ntwb / wordpress

src/wp-includes/default-filters.php

Spacing +315 added lines, -315 removed lines

@@ -13,468 +13,468 @@
  */
 
 // Strip, trim, kses, special chars for string saves
-foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname' ) as $filter ) {
-	add_filter( $filter, 'sanitize_text_field'  );
-	add_filter( $filter, 'wp_filter_kses'       );
-	add_filter( $filter, '_wp_specialchars', 30 );
+foreach (array('pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname') as $filter) {
+	add_filter($filter, 'sanitize_text_field');
+	add_filter($filter, 'wp_filter_kses');
+	add_filter($filter, '_wp_specialchars', 30);
 }
 
 // Strip, kses, special chars for string display
-foreach ( array( 'term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname' ) as $filter ) {
-	if ( is_admin() ) {
+foreach (array('term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname') as $filter) {
+	if (is_admin()) {
 		// These are expensive. Run only on admin pages for defense in depth.
-		add_filter( $filter, 'sanitize_text_field'  );
-		add_filter( $filter, 'wp_kses_data'       );
+		add_filter($filter, 'sanitize_text_field');
+		add_filter($filter, 'wp_kses_data');
 	}
-	add_filter( $filter, '_wp_specialchars', 30 );
+	add_filter($filter, '_wp_specialchars', 30);
 }
 
 // Kses only for textarea saves
-foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {
-	add_filter( $filter, 'wp_filter_kses' );
+foreach (array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description') as $filter) {
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Kses only for textarea admin displays
-if ( is_admin() ) {
-	foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description' ) as $filter ) {
-		add_filter( $filter, 'wp_kses_data' );
+if (is_admin()) {
+	foreach (array('term_description', 'link_description', 'link_notes', 'user_description') as $filter) {
+		add_filter($filter, 'wp_kses_data');
 	}
-	add_filter( 'comment_text', 'wp_kses_post' );
+	add_filter('comment_text', 'wp_kses_post');
 }
 
 // Email saves
-foreach ( array( 'pre_comment_author_email', 'pre_user_email' ) as $filter ) {
-	add_filter( $filter, 'trim'           );
-	add_filter( $filter, 'sanitize_email' );
-	add_filter( $filter, 'wp_filter_kses' );
+foreach (array('pre_comment_author_email', 'pre_user_email') as $filter) {
+	add_filter($filter, 'trim');
+	add_filter($filter, 'sanitize_email');
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Email admin display
-foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {
-	add_filter( $filter, 'sanitize_email' );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data' );
+foreach (array('comment_author_email', 'user_email') as $filter) {
+	add_filter($filter, 'sanitize_email');
+	if (is_admin())
+		add_filter($filter, 'wp_kses_data');
 }
 
 // Save URL
-foreach ( array( 'pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
-	'pre_link_rss', 'pre_post_guid' ) as $filter ) {
-	add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url_raw'       );
-	add_filter( $filter, 'wp_filter_kses'    );
+foreach (array('pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
+	'pre_link_rss', 'pre_post_guid') as $filter) {
+	add_filter($filter, 'wp_strip_all_tags');
+	add_filter($filter, 'esc_url_raw');
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Display URL
-foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid' ) as $filter ) {
-	if ( is_admin() )
-		add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url'           );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data'    );
+foreach (array('user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid') as $filter) {
+	if (is_admin())
+		add_filter($filter, 'wp_strip_all_tags');
+	add_filter($filter, 'esc_url');
+	if (is_admin())
+		add_filter($filter, 'wp_kses_data');
 }
 
 // Slugs
-add_filter( 'pre_term_slug', 'sanitize_title' );
+add_filter('pre_term_slug', 'sanitize_title');
 
 // Keys
-foreach ( array( 'pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status' ) as $filter ) {
-	add_filter( $filter, 'sanitize_key' );
+foreach (array('pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status') as $filter) {
+	add_filter($filter, 'sanitize_key');
 }
 
 // Mime types
-add_filter( 'pre_post_mime_type', 'sanitize_mime_type' );
-add_filter( 'post_mime_type', 'sanitize_mime_type' );
+add_filter('pre_post_mime_type', 'sanitize_mime_type');
+add_filter('post_mime_type', 'sanitize_mime_type');
 
 // Places to balance tags on input
-foreach ( array( 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content' ) as $filter ) {
-	add_filter( $filter, 'convert_invalid_entities' );
-	add_filter( $filter, 'balanceTags', 50 );
+foreach (array('content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content') as $filter) {
+	add_filter($filter, 'convert_invalid_entities');
+	add_filter($filter, 'balanceTags', 50);
 }
 
 // Format strings for display.
-foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'   );
-	add_filter( $filter, 'convert_chars' );
-	add_filter( $filter, 'esc_html'      );
+foreach (array('comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'convert_chars');
+	add_filter($filter, 'esc_html');
 }
 
 // Format WordPress
-foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter )
-	add_filter( $filter, 'capital_P_dangit', 11 );
-add_filter( 'comment_text', 'capital_P_dangit', 31 );
+foreach (array('the_content', 'the_title', 'wp_title') as $filter)
+	add_filter($filter, 'capital_P_dangit', 11);
+add_filter('comment_text', 'capital_P_dangit', 31);
 
 // Format titles
-foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize' );
-	add_filter( $filter, 'strip_tags'  );
+foreach (array('single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'strip_tags');
 }
 
 // Format text area for display.
-foreach ( array( 'term_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'      );
-	add_filter( $filter, 'convert_chars'    );
-	add_filter( $filter, 'wpautop'          );
-	add_filter( $filter, 'shortcode_unautop');
+foreach (array('term_description') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'convert_chars');
+	add_filter($filter, 'wpautop');
+	add_filter($filter, 'shortcode_unautop');
 }
 
 // Format for RSS
-add_filter( 'term_name_rss', 'convert_chars' );
+add_filter('term_name_rss', 'convert_chars');
 
 // Pre save hierarchy
-add_filter( 'wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2 );
-add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
+add_filter('wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2);
+add_filter('wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3);
 
 // Display filters
-add_filter( 'the_title', 'wptexturize'   );
-add_filter( 'the_title', 'convert_chars' );
-add_filter( 'the_title', 'trim'          );
+add_filter('the_title', 'wptexturize');
+add_filter('the_title', 'convert_chars');
+add_filter('the_title', 'trim');
 
-add_filter( 'the_content', 'wptexturize'                       );
-add_filter( 'the_content', 'convert_smilies'                   );
-add_filter( 'the_content', 'wpautop'                           );
-add_filter( 'the_content', 'shortcode_unautop'                 );
-add_filter( 'the_content', 'prepend_attachment'                );
-add_filter( 'the_content', 'wp_make_content_images_responsive' );
+add_filter('the_content', 'wptexturize');
+add_filter('the_content', 'convert_smilies');
+add_filter('the_content', 'wpautop');
+add_filter('the_content', 'shortcode_unautop');
+add_filter('the_content', 'prepend_attachment');
+add_filter('the_content', 'wp_make_content_images_responsive');
 
-add_filter( 'the_excerpt',     'wptexturize'      );
-add_filter( 'the_excerpt',     'convert_smilies'  );
-add_filter( 'the_excerpt',     'convert_chars'    );
-add_filter( 'the_excerpt',     'wpautop'          );
-add_filter( 'the_excerpt',     'shortcode_unautop');
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt'  );
+add_filter('the_excerpt', 'wptexturize');
+add_filter('the_excerpt', 'convert_smilies');
+add_filter('the_excerpt', 'convert_chars');
+add_filter('the_excerpt', 'wpautop');
+add_filter('the_excerpt', 'shortcode_unautop');
+add_filter('get_the_excerpt', 'wp_trim_excerpt');
 
-add_filter( 'comment_text', 'wptexturize'            );
-add_filter( 'comment_text', 'convert_chars'          );
-add_filter( 'comment_text', 'make_clickable',      9 );
-add_filter( 'comment_text', 'force_balance_tags', 25 );
-add_filter( 'comment_text', 'convert_smilies',    20 );
-add_filter( 'comment_text', 'wpautop',            30 );
+add_filter('comment_text', 'wptexturize');
+add_filter('comment_text', 'convert_chars');
+add_filter('comment_text', 'make_clickable', 9);
+add_filter('comment_text', 'force_balance_tags', 25);
+add_filter('comment_text', 'convert_smilies', 20);
+add_filter('comment_text', 'wpautop', 30);
 
-add_filter( 'comment_excerpt', 'convert_chars' );
+add_filter('comment_excerpt', 'convert_chars');
 
-add_filter( 'list_cats',         'wptexturize' );
+add_filter('list_cats', 'wptexturize');
 
-add_filter( 'wp_sprintf', 'wp_sprintf_l', 10, 2 );
+add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2);
 
-add_filter( 'widget_text', 'balanceTags' );
+add_filter('widget_text', 'balanceTags');
 
-add_filter( 'date_i18n', 'wp_maybe_decline_date' );
+add_filter('date_i18n', 'wp_maybe_decline_date');
 
 // RSS filters
-add_filter( 'the_title_rss',      'strip_tags'                    );
-add_filter( 'the_title_rss',      'ent2ncr',                    8 );
-add_filter( 'the_title_rss',      'esc_html'                      );
-add_filter( 'the_content_rss',    'ent2ncr',                    8 );
-add_filter( 'the_content_feed',   'wp_staticize_emoji'            );
-add_filter( 'the_content_feed',   '_oembed_filter_feed_content'   );
-add_filter( 'the_excerpt_rss',    'convert_chars'                 );
-add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
-add_filter( 'comment_author_rss', 'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'esc_html'                      );
-add_filter( 'comment_text_rss',   'wp_staticize_emoji'            );
-add_filter( 'bloginfo_rss',       'ent2ncr',                    8 );
-add_filter( 'the_author',         'ent2ncr',                    8 );
-add_filter( 'the_guid',           'esc_url'                       );
+add_filter('the_title_rss', 'strip_tags');
+add_filter('the_title_rss', 'ent2ncr', 8);
+add_filter('the_title_rss', 'esc_html');
+add_filter('the_content_rss', 'ent2ncr', 8);
+add_filter('the_content_feed', 'wp_staticize_emoji');
+add_filter('the_content_feed', '_oembed_filter_feed_content');
+add_filter('the_excerpt_rss', 'convert_chars');
+add_filter('the_excerpt_rss', 'ent2ncr', 8);
+add_filter('comment_author_rss', 'ent2ncr', 8);
+add_filter('comment_text_rss', 'ent2ncr', 8);
+add_filter('comment_text_rss', 'esc_html');
+add_filter('comment_text_rss', 'wp_staticize_emoji');
+add_filter('bloginfo_rss', 'ent2ncr', 8);
+add_filter('the_author', 'ent2ncr', 8);
+add_filter('the_guid', 'esc_url');
 
 // Email filters
-add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
+add_filter('wp_mail', 'wp_staticize_emoji_for_email');
 
 // Misc filters
-add_filter( 'option_ping_sites',        'privacy_ping_filter'                 );
-add_filter( 'option_blog_charset',      '_wp_specialchars'                    ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
-add_filter( 'option_blog_charset',      '_canonical_charset'                  );
-add_filter( 'option_home',              '_config_wp_home'                     );
-add_filter( 'option_siteurl',           '_config_wp_siteurl'                  );
-add_filter( 'tiny_mce_before_init',     '_mce_set_direction'                  );
-add_filter( 'teeny_mce_before_init',    '_mce_set_direction'                  );
-add_filter( 'pre_kses',                 'wp_pre_kses_less_than'               );
-add_filter( 'sanitize_title',           'sanitize_title_with_dashes',   10, 3 );
-add_action( 'check_comment_flood',      'check_comment_flood_db',       10, 3 );
-add_filter( 'comment_flood_filter',     'wp_throttle_comment_flood',    10, 3 );
-add_filter( 'pre_comment_content',      'wp_rel_nofollow',              15    );
-add_filter( 'comment_email',            'antispambot'                         );
-add_filter( 'option_tag_base',          '_wp_filter_taxonomy_base'            );
-add_filter( 'option_category_base',     '_wp_filter_taxonomy_base'            );
-add_filter( 'the_posts',                '_close_comments_for_old_posts', 10, 2);
-add_filter( 'comments_open',            '_close_comments_for_old_post', 10, 2 );
-add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );
-add_filter( 'editable_slug',            'urldecode'                           );
-add_filter( 'editable_slug',            'esc_textarea'                        );
-add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'        );
-add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri'            );
-add_filter( 'xmlrpc_pingback_error',    'xmlrpc_pingback_error'               );
-add_filter( 'title_save_pre',           'trim'                                );
-
-add_filter( 'http_request_host_is_external', 'allowed_http_request_hosts', 10, 2 );
+add_filter('option_ping_sites', 'privacy_ping_filter');
+add_filter('option_blog_charset', '_wp_specialchars'); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
+add_filter('option_blog_charset', '_canonical_charset');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
+add_filter('tiny_mce_before_init', '_mce_set_direction');
+add_filter('teeny_mce_before_init', '_mce_set_direction');
+add_filter('pre_kses', 'wp_pre_kses_less_than');
+add_filter('sanitize_title', 'sanitize_title_with_dashes', 10, 3);
+add_action('check_comment_flood', 'check_comment_flood_db', 10, 3);
+add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
+add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
+add_filter('comment_email', 'antispambot');
+add_filter('option_tag_base', '_wp_filter_taxonomy_base');
+add_filter('option_category_base', '_wp_filter_taxonomy_base');
+add_filter('the_posts', '_close_comments_for_old_posts', 10, 2);
+add_filter('comments_open', '_close_comments_for_old_post', 10, 2);
+add_filter('pings_open', '_close_comments_for_old_post', 10, 2);
+add_filter('editable_slug', 'urldecode');
+add_filter('editable_slug', 'esc_textarea');
+add_filter('nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object');
+add_filter('pingback_ping_source_uri', 'pingback_ping_source_uri');
+add_filter('xmlrpc_pingback_error', 'xmlrpc_pingback_error');
+add_filter('title_save_pre', 'trim');
+
+add_filter('http_request_host_is_external', 'allowed_http_request_hosts', 10, 2);
 
 // REST API filters.
-add_action( 'xmlrpc_rsd_apis',            'rest_output_rsd' );
-add_action( 'wp_head',                    'rest_output_link_wp_head', 10, 0 );
-add_action( 'template_redirect',          'rest_output_link_header', 11, 0 );
-add_action( 'auth_cookie_malformed',      'rest_cookie_collect_status' );
-add_action( 'auth_cookie_expired',        'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_username',   'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_hash',       'rest_cookie_collect_status' );
-add_action( 'auth_cookie_valid',          'rest_cookie_collect_status' );
-add_filter( 'rest_authentication_errors', 'rest_cookie_check_errors', 100 );
+add_action('xmlrpc_rsd_apis', 'rest_output_rsd');
+add_action('wp_head', 'rest_output_link_wp_head', 10, 0);
+add_action('template_redirect', 'rest_output_link_header', 11, 0);
+add_action('auth_cookie_malformed', 'rest_cookie_collect_status');
+add_action('auth_cookie_expired', 'rest_cookie_collect_status');
+add_action('auth_cookie_bad_username', 'rest_cookie_collect_status');
+add_action('auth_cookie_bad_hash', 'rest_cookie_collect_status');
+add_action('auth_cookie_valid', 'rest_cookie_collect_status');
+add_filter('rest_authentication_errors', 'rest_cookie_check_errors', 100);
 
 // Actions
-add_action( 'wp_head',             '_wp_render_title_tag',            1     );
-add_action( 'wp_head',             'wp_enqueue_scripts',              1     );
-add_action( 'wp_head',             'feed_links',                      2     );
-add_action( 'wp_head',             'feed_links_extra',                3     );
-add_action( 'wp_head',             'rsd_link'                               );
-add_action( 'wp_head',             'wlwmanifest_link'                       );
-add_action( 'wp_head',             'adjacent_posts_rel_link_wp_head', 10, 0 );
-add_action( 'wp_head',             'locale_stylesheet'                      );
-add_action( 'publish_future_post', 'check_and_publish_future_post',   10, 1 );
-add_action( 'wp_head',             'noindex',                          1    );
-add_action( 'wp_head',             'print_emoji_detection_script',     7    );
-add_action( 'wp_head',             'wp_print_styles',                  8    );
-add_action( 'wp_head',             'wp_print_head_scripts',            9    );
-add_action( 'wp_head',             'wp_generator'                           );
-add_action( 'wp_head',             'rel_canonical'                          );
-add_action( 'wp_head',             'wp_shortlink_wp_head',            10, 0 );
-add_action( 'wp_head',             'wp_site_icon',                    99    );
-add_action( 'wp_footer',           'wp_print_footer_scripts',         20    );
-add_action( 'template_redirect',   'wp_shortlink_header',             11, 0 );
-add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
-add_action( 'init',                'check_theme_switched',            99    );
-add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
-add_action( 'wp_print_styles',     'print_emoji_styles'                     );
-
-if ( isset( $_GET['replytocom'] ) )
-    add_action( 'wp_head', 'wp_no_robots' );
+add_action('wp_head', '_wp_render_title_tag', 1);
+add_action('wp_head', 'wp_enqueue_scripts', 1);
+add_action('wp_head', 'feed_links', 2);
+add_action('wp_head', 'feed_links_extra', 3);
+add_action('wp_head', 'rsd_link');
+add_action('wp_head', 'wlwmanifest_link');
+add_action('wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0);
+add_action('wp_head', 'locale_stylesheet');
+add_action('publish_future_post', 'check_and_publish_future_post', 10, 1);
+add_action('wp_head', 'noindex', 1);
+add_action('wp_head', 'print_emoji_detection_script', 7);
+add_action('wp_head', 'wp_print_styles', 8);
+add_action('wp_head', 'wp_print_head_scripts', 9);
+add_action('wp_head', 'wp_generator');
+add_action('wp_head', 'rel_canonical');
+add_action('wp_head', 'wp_shortlink_wp_head', 10, 0);
+add_action('wp_head', 'wp_site_icon', 99);
+add_action('wp_footer', 'wp_print_footer_scripts', 20);
+add_action('template_redirect', 'wp_shortlink_header', 11, 0);
+add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+add_action('init', 'check_theme_switched', 99);
+add_action('after_switch_theme', '_wp_sidebars_changed');
+add_action('wp_print_styles', 'print_emoji_styles');
+
+if (isset($_GET['replytocom']))
+    add_action('wp_head', 'wp_no_robots');
 
 // Login actions
-add_action( 'login_head',          'wp_print_head_scripts',         9     );
-add_action( 'login_head',          'print_admin_styles',            9     );
-add_action( 'login_head',          'wp_site_icon',                  99    );
-add_action( 'login_footer',        'wp_print_footer_scripts',       20    );
-add_action( 'login_init',          'send_frame_options_header',     10, 0 );
+add_action('login_head', 'wp_print_head_scripts', 9);
+add_action('login_head', 'print_admin_styles', 9);
+add_action('login_head', 'wp_site_icon', 99);
+add_action('login_footer', 'wp_print_footer_scripts', 20);
+add_action('login_init', 'send_frame_options_header', 10, 0);
 
 // Feed Generator Tags
-foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {
-	add_action( $action, 'the_generator' );
+foreach (array('rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head') as $action) {
+	add_action($action, 'the_generator');
 }
 
 // Feed Site Icon
-add_action( 'atom_head', 'atom_site_icon' );
-add_action( 'rss2_head', 'rss2_site_icon' );
+add_action('atom_head', 'atom_site_icon');
+add_action('rss2_head', 'rss2_site_icon');
 
 
 // WP Cron
-if ( !defined( 'DOING_CRON' ) )
-	add_action( 'init', 'wp_cron' );
+if ( ! defined('DOING_CRON'))
+	add_action('init', 'wp_cron');
 
 // 2 Actions 2 Furious
-add_action( 'do_feed_rdf',                'do_feed_rdf',                             10, 1 );
-add_action( 'do_feed_rss',                'do_feed_rss',                             10, 1 );
-add_action( 'do_feed_rss2',               'do_feed_rss2',                            10, 1 );
-add_action( 'do_feed_atom',               'do_feed_atom',                            10, 1 );
-add_action( 'do_pings',                   'do_all_pings',                            10, 1 );
-add_action( 'do_robots',                  'do_robots'                                      );
-add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );
-add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
-add_action( 'admin_print_scripts',        'print_emoji_detection_script'                   );
-add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );
-add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
-add_action( 'admin_print_styles',         'print_emoji_styles'                             );
-add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
-add_action( 'init',                       'smilies_init',                             5    );
-add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );
-add_action( 'plugins_loaded',             'wp_maybe_load_embeds',                     0    );
-add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
+add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
+add_action('do_feed_rss', 'do_feed_rss', 10, 1);
+add_action('do_feed_rss2', 'do_feed_rss2', 10, 1);
+add_action('do_feed_atom', 'do_feed_atom', 10, 1);
+add_action('do_pings', 'do_all_pings', 10, 1);
+add_action('do_robots', 'do_robots');
+add_action('set_comment_cookies', 'wp_set_comment_cookies', 10, 2);
+add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
+add_action('admin_print_scripts', 'print_emoji_detection_script');
+add_action('admin_print_scripts', 'print_head_scripts', 20);
+add_action('admin_print_footer_scripts', '_wp_footer_scripts');
+add_action('admin_print_styles', 'print_emoji_styles');
+add_action('admin_print_styles', 'print_admin_styles', 20);
+add_action('init', 'smilies_init', 5);
+add_action('plugins_loaded', 'wp_maybe_load_widgets', 0);
+add_action('plugins_loaded', 'wp_maybe_load_embeds', 0);
+add_action('shutdown', 'wp_ob_end_flush_all', 1);
 // Create a revision whenever a post is updated.
-add_action( 'post_updated',               'wp_save_post_revision',                   10, 1 );
-add_action( 'publish_post',               '_publish_post_hook',                       5, 1 );
-add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
-add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
-add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
-add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'                            );
-add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'                      );
-add_action( 'admin_init',                 'send_frame_options_header',               10, 0 );
-add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'welcome_panel',              'wp_welcome_panel'                               );
+add_action('post_updated', 'wp_save_post_revision', 10, 1);
+add_action('publish_post', '_publish_post_hook', 5, 1);
+add_action('transition_post_status', '_transition_post_status', 5, 3);
+add_action('transition_post_status', '_update_term_count_on_transition_post_status', 10, 3);
+add_action('comment_form', 'wp_comment_form_unfiltered_html_nonce');
+add_action('wp_scheduled_delete', 'wp_scheduled_delete');
+add_action('wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts');
+add_action('admin_init', 'send_frame_options_header', 10, 0);
+add_action('importer_scheduled_cleanup', 'wp_delete_attachment');
+add_action('upgrader_scheduled_cleanup', 'wp_delete_attachment');
+add_action('welcome_panel', 'wp_welcome_panel');
 
 // Navigation menu actions
-add_action( 'delete_post',                '_wp_delete_post_menu_item'         );
-add_action( 'delete_term',                '_wp_delete_tax_menu_item',   10, 3 );
-add_action( 'transition_post_status',     '_wp_auto_add_pages_to_menu', 10, 3 );
+add_action('delete_post', '_wp_delete_post_menu_item');
+add_action('delete_term', '_wp_delete_tax_menu_item', 10, 3);
+add_action('transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3);
 
 // Post Thumbnail CSS class filtering
-add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add'    );
-add_action( 'end_fetch_post_thumbnail_html',   '_wp_post_thumbnail_class_filter_remove' );
+add_action('begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add');
+add_action('end_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_remove');
 
 // Redirect Old Slugs
-add_action( 'template_redirect',  'wp_old_slug_redirect'              );
-add_action( 'post_updated',       'wp_check_for_changed_slugs', 12, 3 );
-add_action( 'attachment_updated', 'wp_check_for_changed_slugs', 12, 3 );
+add_action('template_redirect', 'wp_old_slug_redirect');
+add_action('post_updated', 'wp_check_for_changed_slugs', 12, 3);
+add_action('attachment_updated', 'wp_check_for_changed_slugs', 12, 3);
 
 // Nonce check for Post Previews
-add_action( 'init', '_show_post_preview' );
+add_action('init', '_show_post_preview');
 
 // Output JS to reset window.name for previews
-add_action( 'wp_head', 'wp_post_preview_js', 1 );
+add_action('wp_head', 'wp_post_preview_js', 1);
 
 // Timezone
-add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
+add_filter('pre_option_gmt_offset', 'wp_timezone_override_offset');
 
 // Admin Color Schemes
-add_action( 'admin_init', 'register_admin_color_schemes', 1);
-add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
+add_action('admin_init', 'register_admin_color_schemes', 1);
+add_action('admin_color_scheme_picker', 'admin_color_scheme_picker');
 
 // If the upgrade hasn't run yet, assume link manager is used.
-add_filter( 'default_option_link_manager_enabled', '__return_true' );
+add_filter('default_option_link_manager_enabled', '__return_true');
 
 // This option no longer exists; tell plugins we always support auto-embedding.
-add_filter( 'default_option_embed_autourls', '__return_true' );
+add_filter('default_option_embed_autourls', '__return_true');
 
 // Default settings for heartbeat
-add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
+add_filter('heartbeat_settings', 'wp_heartbeat_settings');
 
 // Check if the user is logged out
-add_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );
-add_filter( 'heartbeat_send',        'wp_auth_check' );
-add_filter( 'heartbeat_nopriv_send', 'wp_auth_check' );
+add_action('admin_enqueue_scripts', 'wp_auth_check_load');
+add_filter('heartbeat_send', 'wp_auth_check');
+add_filter('heartbeat_nopriv_send', 'wp_auth_check');
 
 // Default authentication filters
-add_filter( 'authenticate', 'wp_authenticate_username_password',  20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_email_password',     20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_spam_check',         99    );
-add_filter( 'determine_current_user', 'wp_validate_auth_cookie'          );
-add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 );
+add_filter('authenticate', 'wp_authenticate_username_password', 20, 3);
+add_filter('authenticate', 'wp_authenticate_email_password', 20, 3);
+add_filter('authenticate', 'wp_authenticate_spam_check', 99);
+add_filter('determine_current_user', 'wp_validate_auth_cookie');
+add_filter('determine_current_user', 'wp_validate_logged_in_cookie', 20);
 
 // Split term updates.
-add_action( 'admin_init',        '_wp_check_for_scheduled_split_terms' );
-add_action( 'split_shared_term', '_wp_check_split_default_terms',  10, 4 );
-add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 );
-add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
-add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
+add_action('admin_init', '_wp_check_for_scheduled_split_terms');
+add_action('split_shared_term', '_wp_check_split_default_terms', 10, 4);
+add_action('split_shared_term', '_wp_check_split_terms_in_menus', 10, 4);
+add_action('split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4);
+add_action('wp_split_shared_term_batch', '_wp_batch_split_terms');
 
 // Email notifications.
-add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
-add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
-add_action( 'after_password_reset', 'wp_password_change_notification' );
-add_action( 'register_new_user',      'wp_send_new_user_notifications' );
-add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
+add_action('comment_post', 'wp_new_comment_notify_moderator');
+add_action('comment_post', 'wp_new_comment_notify_postauthor');
+add_action('after_password_reset', 'wp_password_change_notification');
+add_action('register_new_user', 'wp_send_new_user_notifications');
+add_action('edit_user_created_user', 'wp_send_new_user_notifications', 10, 2);
 
 // REST API actions.
-add_action( 'init',          'rest_api_init' );
-add_action( 'rest_api_init', 'rest_api_default_filters', 10, 1 );
-add_action( 'parse_request', 'rest_api_loaded' );
+add_action('init', 'rest_api_init');
+add_action('rest_api_init', 'rest_api_default_filters', 10, 1);
+add_action('parse_request', 'rest_api_loaded');
 
 /**
  * Filters formerly mixed into wp-includes
  */
 // Theme
-add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
-add_action( 'wp_head', '_custom_logo_header_styles' );
-add_action( 'plugins_loaded', '_wp_customize_include' );
-add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
-add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
+add_action('wp_loaded', '_custom_header_background_just_in_time');
+add_action('wp_head', '_custom_logo_header_styles');
+add_action('plugins_loaded', '_wp_customize_include');
+add_action('admin_enqueue_scripts', '_wp_customize_loader_settings');
+add_action('delete_attachment', '_delete_attachment_theme_mod');
 
 // Calendar widget cache
-add_action( 'save_post', 'delete_get_calendar_cache' );
-add_action( 'delete_post', 'delete_get_calendar_cache' );
-add_action( 'update_option_start_of_week', 'delete_get_calendar_cache' );
-add_action( 'update_option_gmt_offset', 'delete_get_calendar_cache' );
+add_action('save_post', 'delete_get_calendar_cache');
+add_action('delete_post', 'delete_get_calendar_cache');
+add_action('update_option_start_of_week', 'delete_get_calendar_cache');
+add_action('update_option_gmt_offset', 'delete_get_calendar_cache');
 
 // Author
-add_action( 'transition_post_status', '__clear_multi_author_cache' );
+add_action('transition_post_status', '__clear_multi_author_cache');
 
 // Post
-add_action( 'init', 'create_initial_post_types', 0 ); // highest priority
-add_action( 'admin_menu', '_add_post_type_submenus' );
-add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );
-add_action( 'wp_trash_post',      '_reset_front_page_settings_for_post' );
+add_action('init', 'create_initial_post_types', 0); // highest priority
+add_action('admin_menu', '_add_post_type_submenus');
+add_action('before_delete_post', '_reset_front_page_settings_for_post');
+add_action('wp_trash_post', '_reset_front_page_settings_for_post');
 
 // Post Formats
-add_filter( 'request', '_post_format_request' );
-add_filter( 'term_link', '_post_format_link', 10, 3 );
-add_filter( 'get_post_format', '_post_format_get_term' );
-add_filter( 'get_terms', '_post_format_get_terms', 10, 3 );
-add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
+add_filter('request', '_post_format_request');
+add_filter('term_link', '_post_format_link', 10, 3);
+add_filter('get_post_format', '_post_format_get_term');
+add_filter('get_terms', '_post_format_get_terms', 10, 3);
+add_filter('wp_get_object_terms', '_post_format_wp_get_object_terms');
 
 // KSES
-add_action( 'init', 'kses_init' );
-add_action( 'set_current_user', 'kses_init' );
+add_action('init', 'kses_init');
+add_action('set_current_user', 'kses_init');
 
 // Script Loader
-add_action( 'wp_default_scripts', 'wp_default_scripts' );
-add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
-add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
+add_action('wp_default_scripts', 'wp_default_scripts');
+add_filter('wp_print_scripts', 'wp_just_in_time_script_localization');
+add_filter('print_scripts_array', 'wp_prototype_before_jquery');
 
-add_action( 'wp_default_styles', 'wp_default_styles' );
-add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
+add_action('wp_default_styles', 'wp_default_styles');
+add_filter('style_loader_src', 'wp_style_loader_src', 10, 2);
 
 // Taxonomy
-add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
+add_action('init', 'create_initial_taxonomies', 0); // highest priority
 
 // Canonical
-add_action( 'template_redirect', 'redirect_canonical' );
-add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
+add_action('template_redirect', 'redirect_canonical');
+add_action('template_redirect', 'wp_redirect_admin_locations', 1000);
 
 // Shortcodes
-add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop()
+add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
 
 // Media
-add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
-add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );
+add_action('wp_playlist_scripts', 'wp_playlist_scripts');
+add_action('customize_controls_enqueue_scripts', 'wp_plupload_default_settings');
 
 // Nav menu
-add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );
+add_filter('nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2);
 
 // Widgets
-add_action( 'init', 'wp_widgets_init', 1 );
+add_action('init', 'wp_widgets_init', 1);
 
 // Admin Bar
 // Don't remove. Wrong way to disable.
-add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
-add_action( 'admin_init', '_wp_admin_bar_init' );
-add_action( 'before_signup_header', '_wp_admin_bar_init' );
-add_action( 'activate_header', '_wp_admin_bar_init' );
-add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
-add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
+add_action('template_redirect', '_wp_admin_bar_init', 0);
+add_action('admin_init', '_wp_admin_bar_init');
+add_action('before_signup_header', '_wp_admin_bar_init');
+add_action('activate_header', '_wp_admin_bar_init');
+add_action('wp_footer', 'wp_admin_bar_render', 1000);
+add_action('in_admin_header', 'wp_admin_bar_render', 0);
 
 // Former admin filters that can also be hooked on the front end
-add_action( 'media_buttons', 'media_buttons' );
-add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
-add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
+add_action('media_buttons', 'media_buttons');
+add_filter('image_send_to_editor', 'image_add_caption', 20, 8);
+add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
 
 // Embeds
-add_action( 'rest_api_init',          'wp_oembed_register_route'              );
-add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 );
-
-add_action( 'wp_head',                'wp_oembed_add_discovery_links'         );
-add_action( 'wp_head',                'wp_oembed_add_host_js'                 );
-
-add_action( 'embed_head',             'enqueue_embed_scripts',           1    );
-add_action( 'embed_head',             'print_emoji_detection_script'          );
-add_action( 'embed_head',             'print_embed_styles'                    );
-add_action( 'embed_head',             'wp_print_head_scripts',          20    );
-add_action( 'embed_head',             'wp_print_styles',                20    );
-add_action( 'embed_head',             'wp_no_robots'                          );
-add_action( 'embed_head',             'rel_canonical'                         );
-add_action( 'embed_head',             'locale_stylesheet'                     );
-
-add_action( 'embed_content_meta',     'print_embed_comments_button'           );
-add_action( 'embed_content_meta',     'print_embed_sharing_button'            );
-
-add_action( 'embed_footer',           'print_embed_sharing_dialog'            );
-add_action( 'embed_footer',           'print_embed_scripts'                   );
-add_action( 'embed_footer',           'wp_print_footer_scripts',        20    );
-
-add_filter( 'excerpt_more',           'wp_embed_excerpt_more',          20    );
-add_filter( 'the_excerpt_embed',      'wptexturize'                           );
-add_filter( 'the_excerpt_embed',      'convert_chars'                         );
-add_filter( 'the_excerpt_embed',      'wpautop'                               );
-add_filter( 'the_excerpt_embed',      'shortcode_unautop'                     );
-add_filter( 'the_excerpt_embed',      'wp_embed_excerpt_attachment'           );
-
-add_filter( 'oembed_dataparse',       'wp_filter_oembed_result',        10, 3 );
-add_filter( 'oembed_response_data',   'get_oembed_response_data_rich',  10, 4 );
-
-unset( $filter, $action );
+add_action('rest_api_init', 'wp_oembed_register_route');
+add_filter('rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4);
+
+add_action('wp_head', 'wp_oembed_add_discovery_links');
+add_action('wp_head', 'wp_oembed_add_host_js');
+
+add_action('embed_head', 'enqueue_embed_scripts', 1);
+add_action('embed_head', 'print_emoji_detection_script');
+add_action('embed_head', 'print_embed_styles');
+add_action('embed_head', 'wp_print_head_scripts', 20);
+add_action('embed_head', 'wp_print_styles', 20);
+add_action('embed_head', 'wp_no_robots');
+add_action('embed_head', 'rel_canonical');
+add_action('embed_head', 'locale_stylesheet');
+
+add_action('embed_content_meta', 'print_embed_comments_button');
+add_action('embed_content_meta', 'print_embed_sharing_button');
+
+add_action('embed_footer', 'print_embed_sharing_dialog');
+add_action('embed_footer', 'print_embed_scripts');
+add_action('embed_footer', 'wp_print_footer_scripts', 20);
+
+add_filter('excerpt_more', 'wp_embed_excerpt_more', 20);
+add_filter('the_excerpt_embed', 'wptexturize');
+add_filter('the_excerpt_embed', 'convert_chars');
+add_filter('the_excerpt_embed', 'wpautop');
+add_filter('the_excerpt_embed', 'shortcode_unautop');
+add_filter('the_excerpt_embed', 'wp_embed_excerpt_attachment');
+
+add_filter('oembed_dataparse', 'wp_filter_oembed_result', 10, 3);
+add_filter('oembed_response_data', 'get_oembed_response_data_rich', 10, 4);
+
+unset($filter, $action);

src/wp-includes/class-wp-http-curl.php

Spacing +107 added lines, -107 removed lines

@@ -81,129 +81,129 @@ 
 			'headers' => array(), 'body' => null, 'cookies' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
-		} elseif ( isset( $r['headers']['user-agent'] ) ) {
+			unset($r['headers']['User-Agent']);
+		} elseif (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		WP_Http::buildCookieHeader( $r );
+		WP_Http::buildCookieHeader($r);
 
 		$handle = curl_init();
 
 		// cURL offers really easy proxy support.
 		$proxy = new WP_HTTP_Proxy();
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) {
 
-			curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
-			curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() );
-			curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() );
+			curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+			curl_setopt($handle, CURLOPT_PROXY, $proxy->host());
+			curl_setopt($handle, CURLOPT_PROXYPORT, $proxy->port());
 
-			if ( $proxy->use_authentication() ) {
-				curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
-				curl_setopt( $handle, CURLOPT_PROXYUSERPWD, $proxy->authentication() );
+			if ($proxy->use_authentication()) {
+				curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+				curl_setopt($handle, CURLOPT_PROXYUSERPWD, $proxy->authentication());
 			}
 		}
 
 		$is_local = isset($r['local']) && $r['local'];
 		$ssl_verify = isset($r['sslverify']) && $r['sslverify'];
-		if ( $is_local ) {
+		if ($is_local) {
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
-		} elseif ( ! $is_local ) {
+			$ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
+		} elseif ( ! $is_local) {
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			$ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify );
+			$ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 		}
 
 		/*
 		 * CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since.
 		 * a value of 0 will allow an unlimited timeout.
 		 */
-		$timeout = (int) ceil( $r['timeout'] );
-		curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
-		curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
+		$timeout = (int) ceil($r['timeout']);
+		curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, $timeout);
+		curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
 
-		curl_setopt( $handle, CURLOPT_URL, $url);
-		curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
-		curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
+		curl_setopt($handle, CURLOPT_URL, $url);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, ($ssl_verify === true) ? 2 : false);
+		curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify);
 
-		if ( $ssl_verify ) {
-			curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
+		if ($ssl_verify) {
+			curl_setopt($handle, CURLOPT_CAINFO, $r['sslcertificates']);
 		}
 
-		curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
+		curl_setopt($handle, CURLOPT_USERAGENT, $r['user-agent']);
 
 		/*
 		 * The option doesn't work with safe mode or when open_basedir is set, and there's
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
-		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
-			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		curl_setopt($handle, CURLOPT_FOLLOWLOCATION, false);
+		if (defined('CURLOPT_PROTOCOLS')) // PHP 5.2.10 / cURL 7.19.4
+			curl_setopt($handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 
-		switch ( $r['method'] ) {
+		switch ($r['method']) {
 			case 'HEAD':
-				curl_setopt( $handle, CURLOPT_NOBODY, true );
+				curl_setopt($handle, CURLOPT_NOBODY, true);
 				break;
 			case 'POST':
-				curl_setopt( $handle, CURLOPT_POST, true );
-				curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_POST, true);
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 			case 'PUT':
-				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, 'PUT' );
-				curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, 'PUT');
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 			default:
-				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
-					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, $r['method']);
+				if ( ! is_null($r['body']))
+					curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 		}
 
-		if ( true === $r['blocking'] ) {
-			curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
-			curl_setopt( $handle, CURLOPT_WRITEFUNCTION, array( $this, 'stream_body' ) );
+		if (true === $r['blocking']) {
+			curl_setopt($handle, CURLOPT_HEADERFUNCTION, array($this, 'stream_headers'));
+			curl_setopt($handle, CURLOPT_WRITEFUNCTION, array($this, 'stream_body'));
 		}
 
-		curl_setopt( $handle, CURLOPT_HEADER, false );
+		curl_setopt($handle, CURLOPT_HEADER, false);
 
-		if ( isset( $r['limit_response_size'] ) )
-			$this->max_body_length = intval( $r['limit_response_size'] );
+		if (isset($r['limit_response_size']))
+			$this->max_body_length = intval($r['limit_response_size']);
 		else
 			$this->max_body_length = false;
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
-		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$this->stream_handle = @fopen( $r['filename'], 'w+' );
+		if ($r['stream']) {
+			if ( ! WP_DEBUG)
+				$this->stream_handle = @fopen($r['filename'], 'w+');
 			else
-				$this->stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $this->stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+				$this->stream_handle = fopen($r['filename'], 'w+');
+			if ( ! $this->stream_handle)
+				return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $r['filename']));
 		} else {
 			$this->stream_handle = false;
 		}
 
-		if ( !empty( $r['headers'] ) ) {
+		if ( ! empty($r['headers'])) {
 			// cURL expects full header strings in each element.
 			$headers = array();
-			foreach ( $r['headers'] as $name => $value ) {
+			foreach ($r['headers'] as $name => $value) {
 				$headers[] = "{$name}: $value";
 			}
-			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
+			curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
 		}
 
-		if ( $r['httpversion'] == '1.0' )
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+		if ($r['httpversion'] == '1.0')
+			curl_setopt($handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		else
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+			curl_setopt($handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -217,27 +217,27 @@ 
 		 * @param array    $r       The HTTP request arguments.
 		 * @param string   $url     The request URL.
 		 */
-		do_action_ref_array( 'http_api_curl', array( &$handle, $r, $url ) );
+		do_action_ref_array('http_api_curl', array(&$handle, $r, $url));
 
 		// We don't need to return the body, so don't. Just execute request and return.
-		if ( ! $r['blocking'] ) {
-			curl_exec( $handle );
+		if ( ! $r['blocking']) {
+			curl_exec($handle);
 
-			if ( $curl_error = curl_error( $handle ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', $curl_error );
+			if ($curl_error = curl_error($handle)) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', $curl_error);
 			}
-			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+			if (in_array(curl_getinfo($handle, CURLINFO_HTTP_CODE), array(301, 302))) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', __('Too many redirects.'));
 			}
 
-			curl_close( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+			curl_close($handle);
+			return array('headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array());
 		}
 
-		curl_exec( $handle );
-		$theHeaders = WP_Http::processHeaders( $this->headers, $url );
+		curl_exec($handle);
+		$theHeaders = WP_Http::processHeaders($this->headers, $url);
 		$theBody = $this->body;
 		$bytes_written_total = $this->bytes_written_total;
 
@@ -245,37 +245,37 @@ 
 		$this->body = '';
 		$this->bytes_written_total = 0;
 
-		$curl_error = curl_errno( $handle );
+		$curl_error = curl_errno($handle);
 
 		// If an error occurred, or, no response.
-		if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) {
-			if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
-				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
-					if ( $r['stream'] ) {
-						curl_close( $handle );
-						fclose( $this->stream_handle );
-						return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+		if ($curl_error || (0 == strlen($theBody) && empty($theHeaders['headers']))) {
+			if (CURLE_WRITE_ERROR /* 23 */ == $curl_error) {
+				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total) {
+					if ($r['stream']) {
+						curl_close($handle);
+						fclose($this->stream_handle);
+						return new WP_Error('http_request_failed', __('Failed to write request to temporary file.'));
 					} else {
-						curl_close( $handle );
-						return new WP_Error( 'http_request_failed', curl_error( $handle ) );
+						curl_close($handle);
+						return new WP_Error('http_request_failed', curl_error($handle));
 					}
 				}
 			} else {
-				if ( $curl_error = curl_error( $handle ) ) {
-					curl_close( $handle );
-					return new WP_Error( 'http_request_failed', $curl_error );
+				if ($curl_error = curl_error($handle)) {
+					curl_close($handle);
+					return new WP_Error('http_request_failed', $curl_error);
 				}
 			}
-			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+			if (in_array(curl_getinfo($handle, CURLINFO_HTTP_CODE), array(301, 302))) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', __('Too many redirects.'));
 			}
 		}
 
-		curl_close( $handle );
+		curl_close($handle);
 
-		if ( $r['stream'] )
-			fclose( $this->stream_handle );
+		if ($r['stream'])
+			fclose($this->stream_handle);
 
 		$response = array(
 			'headers' => $theHeaders['headers'],
@@ -286,11 +286,11 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+		if (false !== ($redirect_response = WP_HTTP::handle_redirects($url, $r, $response)))
 			return $redirect_response;
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
-			$theBody = WP_Http_Encoding::decompress( $theBody );
+		if (true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']))
+			$theBody = WP_Http_Encoding::decompress($theBody);
 
 		$response['body'] = $theBody;
 
@@ -310,9 +310,9 @@ 
 	 * @param string   $headers cURL request headers.
 	 * @return int Length of the request headers.
 	 */
-	private function stream_headers( $handle, $headers ) {
+	private function stream_headers($handle, $headers) {
 		$this->headers .= $headers;
-		return strlen( $headers );
+		return strlen($headers);
 	}
 
 	/**
@@ -329,16 +329,16 @@ 
 	 * @param string   $data    cURL request body.
 	 * @return int Total bytes of data written.
 	 */
-	private function stream_body( $handle, $data ) {
-		$data_length = strlen( $data );
+	private function stream_body($handle, $data) {
+		$data_length = strlen($data);
 
-		if ( $this->max_body_length && ( $this->bytes_written_total + $data_length ) > $this->max_body_length ) {
-			$data_length = ( $this->max_body_length - $this->bytes_written_total );
-			$data = substr( $data, 0, $data_length );
+		if ($this->max_body_length && ($this->bytes_written_total + $data_length) > $this->max_body_length) {
+			$data_length = ($this->max_body_length - $this->bytes_written_total);
+			$data = substr($data, 0, $data_length);
 		}
 
-		if ( $this->stream_handle ) {
-			$bytes_written = fwrite( $this->stream_handle, $data );
+		if ($this->stream_handle) {
+			$bytes_written = fwrite($this->stream_handle, $data);
 		} else {
 			$this->body .= $data;
 			$bytes_written = $data_length;
@@ -359,16 +359,16 @@ 
 	 * @param array $args Optional. Array of request arguments. Default empty array.
 	 * @return bool False means this class can not be used, true means it can.
 	 */
-	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
+	public static function test($args = array()) {
+		if ( ! function_exists('curl_init') || ! function_exists('curl_exec'))
 			return false;
 
-		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+		$is_ssl = isset($args['ssl']) && $args['ssl'];
 
-		if ( $is_ssl ) {
+		if ($is_ssl) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
+			if ( ! (CURL_VERSION_SSL & $curl_version['features']))
 				return false;
 		}
 
@@ -380,6 +380,6 @@ 
 		 * @param bool  $use_class Whether the class can be used. Default true.
 		 * @param array $args      An array of request arguments.
 		 */
-		return apply_filters( 'use_curl_transport', true, $args );
+		return apply_filters('use_curl_transport', true, $args);
 	}
 }

Braces +39 added lines, -27 removed lines

@@ -145,8 +145,10 @@ 
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
 		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
+		if ( defined( 'CURLOPT_PROTOCOLS' ) ) {
+			// PHP 5.2.10 / cURL 7.19.4
 			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		}
 
 		switch ( $r['method'] ) {
 			case 'HEAD':
@@ -162,8 +164,9 @@ 
 				break;
 			default:
 				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
-					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				if ( ! is_null( $r['body'] ) ) {
+									curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				}
 				break;
 		}
 
@@ -174,19 +177,22 @@ 
 
 		curl_setopt( $handle, CURLOPT_HEADER, false );
 
-		if ( isset( $r['limit_response_size'] ) )
-			$this->max_body_length = intval( $r['limit_response_size'] );
-		else
-			$this->max_body_length = false;
+		if ( isset( $r['limit_response_size'] ) ) {
+					$this->max_body_length = intval( $r['limit_response_size'] );
+		} else {
+					$this->max_body_length = false;
+		}
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$this->stream_handle = @fopen( $r['filename'], 'w+' );
-			else
-				$this->stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $this->stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			if ( ! WP_DEBUG ) {
+							$this->stream_handle = @fopen( $r['filename'], 'w+' );
+			} else {
+							$this->stream_handle = fopen( $r['filename'], 'w+' );
+			}
+			if ( ! $this->stream_handle ) {
+							return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			}
 		} else {
 			$this->stream_handle = false;
 		}
@@ -200,10 +206,11 @@ 
 			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
 		}
 
-		if ( $r['httpversion'] == '1.0' )
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
-		else
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		if ( $r['httpversion'] == '1.0' ) {
+					curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+		} else {
+					curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		}
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -274,8 +281,9 @@ 
 
 		curl_close( $handle );
 
-		if ( $r['stream'] )
-			fclose( $this->stream_handle );
+		if ( $r['stream'] ) {
+					fclose( $this->stream_handle );
+		}
 
 		$response = array(
 			'headers' => $theHeaders['headers'],
@@ -286,11 +294,13 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
-			return $redirect_response;
+		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) {
+					return $redirect_response;
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
-			$theBody = WP_Http_Encoding::decompress( $theBody );
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) ) {
+					$theBody = WP_Http_Encoding::decompress( $theBody );
+		}
 
 		$response['body'] = $theBody;
 
@@ -360,16 +370,18 @@ 
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
-			return false;
+		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) ) {
+					return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
-				return false;
+			if ( ! (CURL_VERSION_SSL & $curl_version['features']) ) {
+							return false;
+			}
 		}
 
 		/**

src/wp-includes/ms-blogs.php

Spacing +237 added lines, -237 removed lines

@@ -18,7 +18,7 @@ 
 function wpmu_update_blogs_date() {
 	global $wpdb;
 
-	update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
+	update_blog_details($wpdb->blogid, array('last_updated' => current_time('mysql', true)));
 	/**
 	 * Fires after the blog details are updated.
 	 *
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param int $blog_id Site ID.
 	 */
-	do_action( 'wpmu_blog_updated', $wpdb->blogid );
+	do_action('wpmu_blog_updated', $wpdb->blogid);
 }
 
 /**
@@ -37,17 +37,17 @@ 
  * @param int $blog_id Blog ID
  * @return string Full URL of the blog if found. Empty string if not.
  */
-function get_blogaddress_by_id( $blog_id ) {
-	$bloginfo = get_blog_details( (int) $blog_id );
+function get_blogaddress_by_id($blog_id) {
+	$bloginfo = get_blog_details((int) $blog_id);
 
-	if ( empty( $bloginfo ) ) {
+	if (empty($bloginfo)) {
 		return '';
 	}
 
-	$scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
-	$scheme = empty( $scheme ) ? 'http' : $scheme;
+	$scheme = parse_url($bloginfo->home, PHP_URL_SCHEME);
+	$scheme = empty($scheme) ? 'http' : $scheme;
 
-	return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
+	return esc_url($scheme.'://'.$bloginfo->domain.$bloginfo->path);
 }
 
 /**
@@ -58,17 +58,17 @@ 
  * @param string $blogname The (subdomain or directory) name
  * @return string
  */
-function get_blogaddress_by_name( $blogname ) {
-	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
+function get_blogaddress_by_name($blogname) {
+	if (is_subdomain_install()) {
+		if ($blogname == 'main')
 			$blogname = 'www';
-		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		$url = rtrim(network_home_url(), '/');
+		if ( ! empty($blogname))
+			$url = preg_replace('|^([^\.]+://)|', "\${1}".$blogname.'.', $url);
 	} else {
-		$url = network_home_url( $blogname );
+		$url = network_home_url($blogname);
 	}
-	return esc_url( $url . '/' );
+	return esc_url($url.'/');
 }
 
 /**
@@ -81,26 +81,26 @@ 
  * @param string $slug
  * @return int A blog id
  */
-function get_id_from_blogname( $slug ) {
+function get_id_from_blogname($slug) {
 	global $wpdb;
 
 	$current_site = get_current_site();
-	$slug = trim( $slug, '/' );
+	$slug = trim($slug, '/');
 
-	$blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
-	if ( $blog_id )
+	$blog_id = wp_cache_get('get_id_from_blogname_'.$slug, 'blog-details');
+	if ($blog_id)
 		return $blog_id;
 
-	if ( is_subdomain_install() ) {
-		$domain = $slug . '.' . $current_site->domain;
+	if (is_subdomain_install()) {
+		$domain = $slug.'.'.$current_site->domain;
 		$path = $current_site->path;
 	} else {
 		$domain = $current_site->domain;
-		$path = $current_site->path . $slug . '/';
+		$path = $current_site->path.$slug.'/';
 	}
 
-	$blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
-	wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
+	$blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path));
+	wp_cache_set('get_id_from_blogname_'.$slug, $blog_id, 'blog-details');
 	return $blog_id;
 }
 
@@ -117,42 +117,42 @@ 
  *                                  Default is true.
  * @return WP_Site|false Blog details on success. False on failure.
  */
-function get_blog_details( $fields = null, $get_all = true ) {
+function get_blog_details($fields = null, $get_all = true) {
 	global $wpdb;
 
-	if ( is_array($fields ) ) {
-		if ( isset($fields['blog_id']) ) {
+	if (is_array($fields)) {
+		if (isset($fields['blog_id'])) {
 			$blog_id = $fields['blog_id'];
-		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
-			$key = md5( $fields['domain'] . $fields['path'] );
+		} elseif (isset($fields['domain']) && isset($fields['path'])) {
+			$key = md5($fields['domain'].$fields['path']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
 			}
-		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
-			$key = md5( $fields['domain'] );
+		} elseif (isset($fields['domain']) && is_subdomain_install()) {
+			$key = md5($fields['domain']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
@@ -161,10 +161,10 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
+		if ( ! $fields)
 			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
+		elseif ( ! is_numeric($fields))
+			$blog_id = get_id_from_blogname($fields);
 		else
 			$blog_id = $fields;
 	}
@@ -172,15 +172,15 @@ 
 	$blog_id = (int) $blog_id;
 
 	$all = $get_all == true ? '' : 'short';
-	$details = wp_cache_get( $blog_id . $all, 'blog-details' );
+	$details = wp_cache_get($blog_id.$all, 'blog-details');
 
-	if ( $details ) {
-		if ( ! is_object( $details ) ) {
-			if ( $details == -1 ) {
+	if ($details) {
+		if ( ! is_object($details)) {
+			if ($details == -1) {
 				return false;
 			} else {
 				// Clear old pre-serialized objects. Cache clients do better with that.
-				wp_cache_delete( $blog_id . $all, 'blog-details' );
+				wp_cache_delete($blog_id.$all, 'blog-details');
 				unset($details);
 			}
 		} else {
@@ -189,18 +189,18 @@ 
 	}
 
 	// Try the other cache.
-	if ( $get_all ) {
-		$details = wp_cache_get( $blog_id . 'short', 'blog-details' );
+	if ($get_all) {
+		$details = wp_cache_get($blog_id.'short', 'blog-details');
 	} else {
-		$details = wp_cache_get( $blog_id, 'blog-details' );
+		$details = wp_cache_get($blog_id, 'blog-details');
 		// If short was requested and full cache is set, we can return.
-		if ( $details ) {
-			if ( ! is_object( $details ) ) {
-				if ( $details == -1 ) {
+		if ($details) {
+			if ( ! is_object($details)) {
+				if ($details == -1) {
 					return false;
 				} else {
 					// Clear old pre-serialized objects. Cache clients do better with that.
-					wp_cache_delete( $blog_id, 'blog-details' );
+					wp_cache_delete($blog_id, 'blog-details');
 					unset($details);
 				}
 			} else {
@@ -209,29 +209,29 @@ 
 		}
 	}
 
-	if ( empty($details) ) {
-		$details = WP_Site::get_instance( $blog_id );
-		if ( ! $details ) {
+	if (empty($details)) {
+		$details = WP_Site::get_instance($blog_id);
+		if ( ! $details) {
 			// Set the full cache.
-			wp_cache_set( $blog_id, -1, 'blog-details' );
+			wp_cache_set($blog_id, -1, 'blog-details');
 			return false;
 		}
 	}
 
-	if ( ! $details instanceof WP_Site ) {
-		$details = new WP_Site( $details );
+	if ( ! $details instanceof WP_Site) {
+		$details = new WP_Site($details);
 	}
 
-	if ( ! $get_all ) {
-		wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	if ( ! $get_all) {
+		wp_cache_set($blog_id.$all, $details, 'blog-details');
 		return $details;
 	}
 
-	switch_to_blog( $blog_id );
-	$details->blogname   = get_option( 'blogname' );
-	$details->siteurl    = get_option( 'siteurl' );
-	$details->post_count = get_option( 'post_count' );
-	$details->home       = get_option( 'home' );
+	switch_to_blog($blog_id);
+	$details->blogname   = get_option('blogname');
+	$details->siteurl    = get_option('siteurl');
+	$details->post_count = get_option('post_count');
+	$details->home       = get_option('home');
 	restore_current_blog();
 
 	/**
@@ -241,12 +241,12 @@ 
 	 *
 	 * @param object $details The blog details.
 	 */
-	$details = apply_filters( 'blog_details', $details );
+	$details = apply_filters('blog_details', $details);
 
-	wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	wp_cache_set($blog_id.$all, $details, 'blog-details');
 
-	$key = md5( $details->domain . $details->path );
-	wp_cache_set( $key, $details, 'blog-lookup' );
+	$key = md5($details->domain.$details->path);
+	wp_cache_set($key, $details, 'blog-lookup');
 
 	return $details;
 }
@@ -258,14 +258,14 @@ 
  *
  * @param int $blog_id Optional. Blog ID. Defaults to current blog.
  */
-function refresh_blog_details( $blog_id = 0 ) {
+function refresh_blog_details($blog_id = 0) {
 	$blog_id = (int) $blog_id;
-	if ( ! $blog_id ) {
+	if ( ! $blog_id) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$details = get_blog_details( $blog_id, false );
-	if ( ! $details ) {
+	$details = get_blog_details($blog_id, false);
+	if ( ! $details) {
 		// Make sure clean_blog_cache() gets the blog ID
 		// when the blog has been previously cached as
 		// non-existent.
@@ -276,7 +276,7 @@ 
 		);
 	}
 
-	clean_blog_cache( $details );
+	clean_blog_cache($details);
 
 	/**
 	 * Fires after the blog details cache is cleared.
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'refresh_blog_details', $blog_id );
+	do_action('refresh_blog_details', $blog_id);
 }
 
 /**
@@ -299,17 +299,17 @@ 
  * @param array $details Array of details keyed by blogs table field names.
  * @return bool True if update succeeds, false otherwise.
  */
-function update_blog_details( $blog_id, $details = array() ) {
+function update_blog_details($blog_id, $details = array()) {
 	global $wpdb;
 
-	if ( empty($details) )
+	if (empty($details))
 		return false;
 
-	if ( is_object($details) )
+	if (is_object($details))
 		$details = get_object_vars($details);
 
 	$current_details = get_blog_details($blog_id, false);
-	if ( empty($current_details) )
+	if (empty($current_details))
 		return false;
 
 	$current_details = get_object_vars($current_details);
@@ -318,23 +318,23 @@ 
 	$details['last_updated'] = current_time('mysql', true);
 
 	$update_details = array();
-	$fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
-	foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
-		if ( 'path' === $field ) {
-			$details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
+	$fields = array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
+	foreach (array_intersect(array_keys($details), $fields) as $field) {
+		if ('path' === $field) {
+			$details[$field] = trailingslashit('/'.trim($details[$field], '/'));
 		}
 
-		$update_details[ $field ] = $details[ $field ];
+		$update_details[$field] = $details[$field];
 	}
 
-	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, $update_details, array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
 	// If spam status changed, issue actions.
-	if ( $details['spam'] != $current_details['spam'] ) {
-		if ( $details['spam'] == 1 ) {
+	if ($details['spam'] != $current_details['spam']) {
+		if ($details['spam'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'spam'.
 			 *
@@ -342,7 +342,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'ham'.
@@ -351,13 +351,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
 	}
 
 	// If mature status changed, issue actions.
-	if ( $details['mature'] != $current_details['mature'] ) {
-		if ( $details['mature'] == 1 ) {
+	if ($details['mature'] != $current_details['mature']) {
+		if ($details['mature'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'mature'.
 			 *
@@ -365,7 +365,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'unmature'.
@@ -374,13 +374,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
 	}
 
 	// If archived status changed, issue actions.
-	if ( $details['archived'] != $current_details['archived'] ) {
-		if ( $details['archived'] == 1 ) {
+	if ($details['archived'] != $current_details['archived']) {
+		if ($details['archived'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'archived'.
 			 *
@@ -388,7 +388,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'unarchived'.
@@ -397,13 +397,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
 	}
 
 	// If deleted status changed, issue actions.
-	if ( $details['deleted'] != $current_details['deleted'] ) {
-		if ( $details['deleted'] == 1 ) {
+	if ($details['deleted'] != $current_details['deleted']) {
+		if ($details['deleted'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'deleted'.
 			 *
@@ -411,7 +411,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'undeleted'.
@@ -420,13 +420,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
 	}
 
-	if ( isset( $details['public'] ) ) {
-		switch_to_blog( $blog_id );
-		update_option( 'blog_public', $details['public'] );
+	if (isset($details['public'])) {
+		switch_to_blog($blog_id);
+		update_option('blog_public', $details['public']);
 		restore_current_blog();
 	}
 
@@ -442,18 +442,18 @@ 
  *
  * @param WP_Site $blog The blog details as returned from get_blog_details()
  */
-function clean_blog_cache( $blog ) {
+function clean_blog_cache($blog) {
 	$blog_id = $blog->blog_id;
-	$domain_path_key = md5( $blog->domain . $blog->path );
-
-	wp_cache_delete( $blog_id, 'sites' );
-	wp_cache_delete( $blog_id , 'blog-details' );
-	wp_cache_delete( $blog_id . 'short' , 'blog-details' );
-	wp_cache_delete(  $domain_path_key, 'blog-lookup' );
-	wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
-	wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
-	wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
-	wp_cache_delete( $domain_path_key, 'blog-id-cache' );
+	$domain_path_key = md5($blog->domain.$blog->path);
+
+	wp_cache_delete($blog_id, 'sites');
+	wp_cache_delete($blog_id, 'blog-details');
+	wp_cache_delete($blog_id.'short', 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-lookup');
+	wp_cache_delete('current_blog_'.$blog->domain, 'site-options');
+	wp_cache_delete('current_blog_'.$blog->domain.$blog->path, 'site-options');
+	wp_cache_delete('get_id_from_blogname_'.trim($blog->path, '/'), 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-id-cache');
 }
 
 /**
@@ -473,17 +473,17 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_blog_option( $id, $option, $default = false ) {
+function get_blog_option($id, $option, $default = false) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if (get_current_blog_id() == $id)
+		return get_option($option, $default);
 
-	switch_to_blog( $id );
-	$value = get_option( $option, $default );
+	switch_to_blog($id);
+	$value = get_option($option, $default);
 	restore_current_blog();
 
 	/**
@@ -496,7 +496,7 @@ 
 	 * @param string  $value The option value.
 	 * @param int     $id    Blog ID.
 	 */
-	return apply_filters( "blog_option_{$option}", $value, $id );
+	return apply_filters("blog_option_{$option}", $value, $id);
 }
 
 /**
@@ -518,17 +518,17 @@ 
  * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_blog_option( $id, $option, $value ) {
+function add_blog_option($id, $option, $value) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return add_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = add_option( $option, $value );
+	switch_to_blog($id);
+	$return = add_option($option, $value);
 	restore_current_blog();
 
 	return $return;
@@ -543,17 +543,17 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_blog_option( $id, $option ) {
+function delete_blog_option($id, $option) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if (get_current_blog_id() == $id)
+		return delete_option($option);
 
-	switch_to_blog( $id );
-	$return = delete_option( $option );
+	switch_to_blog($id);
+	$return = delete_option($option);
 	restore_current_blog();
 
 	return $return;
@@ -570,20 +570,20 @@ 
  * @param mixed  $deprecated Not used.
  * @return bool True on success, false on failure.
  */
-function update_blog_option( $id, $option, $value, $deprecated = null ) {
+function update_blog_option($id, $option, $value, $deprecated = null) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return update_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = update_option( $option, $value );
+	switch_to_blog($id);
+	$return = update_option($option, $value);
 	restore_current_blog();
 
-	refresh_blog_details( $id );
+	refresh_blog_details($id);
 
 	return $return;
 }
@@ -612,10 +612,10 @@ 
  * @param bool $deprecated Deprecated argument
  * @return true Always returns True.
  */
-function switch_to_blog( $new_blog, $deprecated = null ) {
+function switch_to_blog($new_blog, $deprecated = null) {
 	global $wpdb;
 
-	if ( empty( $new_blog ) )
+	if (empty($new_blog))
 		$new_blog = $GLOBALS['blog_id'];
 
 	$GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
@@ -625,7 +625,7 @@ 
 	 * set the right vars, do the associated actions, but skip
 	 * the extra unnecessary work
 	 */
-	if ( $new_blog == $GLOBALS['blog_id'] ) {
+	if ($new_blog == $GLOBALS['blog_id']) {
 		/**
 		 * Fires when the blog is switched.
 		 *
@@ -634,46 +634,46 @@ 
 		 * @param int $new_blog New blog ID.
 		 * @param int $new_blog Blog ID.
 		 */
-		do_action( 'switch_blog', $new_blog, $new_blog );
+		do_action('switch_blog', $new_blog, $new_blog);
 		$GLOBALS['switched'] = true;
 		return true;
 	}
 
-	$wpdb->set_blog_id( $new_blog );
+	$wpdb->set_blog_id($new_blog);
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 	$prev_blog_id = $GLOBALS['blog_id'];
 	$GLOBALS['blog_id'] = $new_blog;
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $new_blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($new_blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups))
 			$global_groups = $wp_object_cache->global_groups;
 		else
 			$global_groups = false;
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		wp_roles()->reinit();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $new_blog );
+		$current_user->for_blog($new_blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $new_blog, $prev_blog_id );
+	do_action('switch_blog', $new_blog, $prev_blog_id);
 	$GLOBALS['switched'] = true;
 
 	return true;
@@ -697,57 +697,57 @@ 
 function restore_current_blog() {
 	global $wpdb;
 
-	if ( empty( $GLOBALS['_wp_switched_stack'] ) )
+	if (empty($GLOBALS['_wp_switched_stack']))
 		return false;
 
-	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
+	$blog = array_pop($GLOBALS['_wp_switched_stack']);
 
-	if ( $GLOBALS['blog_id'] == $blog ) {
+	if ($GLOBALS['blog_id'] == $blog) {
 		/** This filter is documented in wp-includes/ms-blogs.php */
-		do_action( 'switch_blog', $blog, $blog );
+		do_action('switch_blog', $blog, $blog);
 		// If we still have items in the switched stack, consider ourselves still 'switched'
-		$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+		$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 		return true;
 	}
 
-	$wpdb->set_blog_id( $blog );
+	$wpdb->set_blog_id($blog);
 	$prev_blog_id = $GLOBALS['blog_id'];
 	$GLOBALS['blog_id'] = $blog;
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups))
 			$global_groups = $wp_object_cache->global_groups;
 		else
 			$global_groups = false;
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		wp_roles()->reinit();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $blog );
+		$current_user->for_blog($blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $blog, $prev_blog_id );
+	do_action('switch_blog', $blog, $prev_blog_id);
 
 	// If we still have items in the switched stack, consider ourselves still 'switched'
-	$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+	$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 
 	return true;
 }
@@ -762,7 +762,7 @@ 
  * @return bool True if switched, false otherwise.
  */
 function ms_is_switched() {
-	return ! empty( $GLOBALS['_wp_switched_stack'] );
+	return ! empty($GLOBALS['_wp_switched_stack']);
 }
 
 /**
@@ -773,7 +773,7 @@ 
  * @param int $id The blog id
  * @return string Whether the blog is archived or not
  */
-function is_archived( $id ) {
+function is_archived($id) {
 	return get_blog_status($id, 'archived');
 }
 
@@ -786,7 +786,7 @@ 
  * @param string $archived The new status
  * @return string $archived
  */
-function update_archived( $id, $archived ) {
+function update_archived($id, $archived) {
 	update_blog_status($id, 'archived', $archived);
 	return $archived;
 }
@@ -804,55 +804,55 @@ 
  * @param null   $deprecated
  * @return string|false $value
  */
-function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
+function update_blog_status($blog_id, $pref, $value, $deprecated = null) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
+	if ( ! in_array($pref, array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
 		return $value;
 
-	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
-	if ( 'spam' == $pref ) {
-		if ( $value == 1 ) {
+	if ('spam' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
-	} elseif ( 'mature' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('mature' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
-	} elseif ( 'archived' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('archived' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
-	} elseif ( 'deleted' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('deleted' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
-	} elseif ( 'public' == $pref ) {
+	} elseif ('public' == $pref) {
 		/**
 		 * Fires after the current blog's 'public' setting is updated.
 		 *
@@ -861,7 +861,7 @@ 
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
  		 */
-		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
+		do_action('update_blog_public', $blog_id, $value); // Moved here from update_blog_public().
 	}
 
 	return $value;
@@ -878,14 +878,14 @@ 
  * @param string $pref A field name
  * @return bool|string|null $value
  */
-function get_blog_status( $id, $pref ) {
+function get_blog_status($id, $pref) {
 	global $wpdb;
 
-	$details = get_blog_details( $id, false );
-	if ( $details )
+	$details = get_blog_details($id, false);
+	if ($details)
 		return $details->$pref;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
+	return $wpdb->get_var($wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id));
 }
 
 /**
@@ -900,13 +900,13 @@ 
  * @param int   $quantity   The maximum number of blogs to retrieve. Default is 40.
  * @return array The list of blogs
  */
-function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
+function get_last_updated($deprecated = '', $start = 0, $quantity = 40) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, 'MU'); // never used
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+	return $wpdb->get_results($wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity), ARRAY_A);
 }
 
 /**
@@ -918,13 +918,13 @@ 
  * @param string $old_status The old post status
  * @param object $post       Post object
  */
-function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) {
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+function _update_blog_date_on_post_publish($new_status, $old_status, $post) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $new_status && 'publish' != $old_status ) {
+	if ('publish' != $new_status && 'publish' != $old_status) {
 		return;
 	}
 
@@ -940,15 +940,15 @@ 
  *
  * @param int $post_id Post ID
  */
-function _update_blog_date_on_post_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_blog_date_on_post_delete($post_id) {
+	$post = get_post($post_id);
 
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $post->post_status ) {
+	if ('publish' != $post->post_status) {
 		return;
 	}
 
@@ -962,10 +962,10 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _update_posts_count_on_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_posts_count_on_delete($post_id) {
+	$post = get_post($post_id);
 
-	if ( ! $post || 'publish' !== $post->post_status ) {
+	if ( ! $post || 'publish' !== $post->post_status) {
 		return;
 	}
 
@@ -980,12 +980,12 @@ 
  * @param string $new_status The status the post is changing to.
  * @param string $old_status The status the post is changing from.
  */
-function _update_posts_count_on_transition_post_status( $new_status, $old_status ) {
-	if ( $new_status === $old_status ) {
+function _update_posts_count_on_transition_post_status($new_status, $old_status) {
+	if ($new_status === $old_status) {
 		return;
 	}
 
-	if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
+	if ('publish' !== $new_status && 'publish' !== $old_status) {
 		return;
 	}
 

src/wp-includes/meta.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Core Metadata API
- *
- * Functions for retrieving and manipulating metadata of various WordPress object types. Metadata
- * for an object is a represented by a simple key-value pair. Objects may contain multiple
- * metadata entries that share the same key and differ only in their value.
- *
- * @package WordPress
- * @subpackage Meta
- */
+	 * Core Metadata API
+	 *
+	 * Functions for retrieving and manipulating metadata of various WordPress object types. Metadata
+	 * for an object is a represented by a simple key-value pair. Objects may contain multiple
+	 * metadata entries that share the same key and differ only in their value.
+	 *
+	 * @package WordPress
+	 * @subpackage Meta
+	 */
 
 /**
  * Add metadata for the specified object.

Spacing +188 added lines, -188 removed lines

@@ -30,26 +30,26 @@ 
 function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = false) {
 	global $wpdb;
 
-	if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) {
+	if ( ! $meta_type || ! $meta_key || ! is_numeric($object_id)) {
 		return false;
 	}
 
-	$object_id = absint( $object_id );
-	if ( ! $object_id ) {
+	$object_id = absint($object_id);
+	if ( ! $object_id) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key($meta_type.'_id');
 
 	// expected_slashed ($meta_key)
 	$meta_key = wp_unslash($meta_key);
 	$meta_value = wp_unslash($meta_value);
-	$meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type );
+	$meta_value = sanitize_meta($meta_key, $meta_value, $meta_type);
 
 	/**
 	 * Filter whether to add metadata of a specific type.
@@ -67,17 +67,17 @@ 
 	 * @param bool      $unique     Whether the specified meta key should be unique
 	 *                              for the object. Optional. Default false.
 	 */
-	$check = apply_filters( "add_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $unique );
-	if ( null !== $check )
+	$check = apply_filters("add_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $unique);
+	if (null !== $check)
 		return $check;
 
-	if ( $unique && $wpdb->get_var( $wpdb->prepare(
+	if ($unique && $wpdb->get_var($wpdb->prepare(
 		"SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
-		$meta_key, $object_id ) ) )
+		$meta_key, $object_id )))
 		return false;
 
 	$_meta_value = $meta_value;
-	$meta_value = maybe_serialize( $meta_value );
+	$meta_value = maybe_serialize($meta_value);
 
 	/**
 	 * Fires immediately before meta of a specific type is added.
@@ -91,20 +91,20 @@ 
 	 * @param string $meta_key   Meta key.
 	 * @param mixed  $meta_value Meta value.
 	 */
-	do_action( "add_{$meta_type}_meta", $object_id, $meta_key, $_meta_value );
+	do_action("add_{$meta_type}_meta", $object_id, $meta_key, $_meta_value);
 
-	$result = $wpdb->insert( $table, array(
+	$result = $wpdb->insert($table, array(
 		$column => $object_id,
 		'meta_key' => $meta_key,
 		'meta_value' => $meta_value
-	) );
+	));
 
-	if ( ! $result )
+	if ( ! $result)
 		return false;
 
 	$mid = (int) $wpdb->insert_id;
 
-	wp_cache_delete($object_id, $meta_type . '_meta');
+	wp_cache_delete($object_id, $meta_type.'_meta');
 
 	/**
 	 * Fires immediately after meta of a specific type is added.
@@ -119,7 +119,7 @@ 
 	 * @param string $meta_key   Meta key.
 	 * @param mixed  $meta_value Meta value.
 	 */
-	do_action( "added_{$meta_type}_meta", $mid, $object_id, $meta_key, $_meta_value );
+	do_action("added_{$meta_type}_meta", $mid, $object_id, $meta_key, $_meta_value);
 
 	return $mid;
 }
@@ -143,21 +143,21 @@ 
 function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') {
 	global $wpdb;
 
-	if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) {
+	if ( ! $meta_type || ! $meta_key || ! is_numeric($object_id)) {
 		return false;
 	}
 
-	$object_id = absint( $object_id );
-	if ( ! $object_id ) {
+	$object_id = absint($object_id);
+	if ( ! $object_id) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key($meta_type.'_id');
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
 	// expected_slashed ($meta_key)
@@ -165,7 +165,7 @@ 
 	$meta_key = wp_unslash($meta_key);
 	$passed_value = $meta_value;
 	$meta_value = wp_unslash($meta_value);
-	$meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type );
+	$meta_value = sanitize_meta($meta_key, $meta_value, $meta_type);
 
 	/**
 	 * Filter whether to update metadata of a specific type.
@@ -184,36 +184,36 @@ 
 	 *                              metadata entries with the specified value.
 	 *                              Otherwise, update all entries.
 	 */
-	$check = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $prev_value );
-	if ( null !== $check )
+	$check = apply_filters("update_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $prev_value);
+	if (null !== $check)
 		return (bool) $check;
 
 	// Compare existing value to new value if no prev value given and the key exists only once.
-	if ( empty($prev_value) ) {
+	if (empty($prev_value)) {
 		$old_value = get_metadata($meta_type, $object_id, $meta_key);
-		if ( count($old_value) == 1 ) {
-			if ( $old_value[0] === $meta_value )
+		if (count($old_value) == 1) {
+			if ($old_value[0] === $meta_value)
 				return false;
 		}
 	}
 
-	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) );
-	if ( empty( $meta_ids ) ) {
-		return add_metadata( $meta_type, $object_id, $raw_meta_key, $passed_value );
+	$meta_ids = $wpdb->get_col($wpdb->prepare("SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id));
+	if (empty($meta_ids)) {
+		return add_metadata($meta_type, $object_id, $raw_meta_key, $passed_value);
 	}
 
 	$_meta_value = $meta_value;
-	$meta_value = maybe_serialize( $meta_value );
+	$meta_value = maybe_serialize($meta_value);
 
-	$data  = compact( 'meta_value' );
-	$where = array( $column => $object_id, 'meta_key' => $meta_key );
+	$data  = compact('meta_value');
+	$where = array($column => $object_id, 'meta_key' => $meta_key);
 
-	if ( !empty( $prev_value ) ) {
+	if ( ! empty($prev_value)) {
 		$prev_value = maybe_serialize($prev_value);
 		$where['meta_value'] = $prev_value;
 	}
 
-	foreach ( $meta_ids as $meta_id ) {
+	foreach ($meta_ids as $meta_id) {
 		/**
 		 * Fires immediately before updating metadata of a specific type.
 		 *
@@ -227,9 +227,9 @@ 
 		 * @param string $meta_key   Meta key.
 		 * @param mixed  $meta_value Meta value.
 		 */
-		do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+		do_action("update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value);
 
-		if ( 'post' == $meta_type ) {
+		if ('post' == $meta_type) {
 			/**
 			 * Fires immediately before updating a post's metadata.
 			 *
@@ -240,17 +240,17 @@ 
 			 * @param string $meta_key   Meta key.
 			 * @param mixed  $meta_value Meta value.
 			 */
-			do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+			do_action('update_postmeta', $meta_id, $object_id, $meta_key, $meta_value);
 		}
 	}
 
-	$result = $wpdb->update( $table, $data, $where );
-	if ( ! $result )
+	$result = $wpdb->update($table, $data, $where);
+	if ( ! $result)
 		return false;
 
-	wp_cache_delete($object_id, $meta_type . '_meta');
+	wp_cache_delete($object_id, $meta_type.'_meta');
 
-	foreach ( $meta_ids as $meta_id ) {
+	foreach ($meta_ids as $meta_id) {
 		/**
 		 * Fires immediately after updating metadata of a specific type.
 		 *
@@ -264,9 +264,9 @@ 
 		 * @param string $meta_key   Meta key.
 		 * @param mixed  $meta_value Meta value.
 		 */
-		do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+		do_action("updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value);
 
-		if ( 'post' == $meta_type ) {
+		if ('post' == $meta_type) {
 			/**
 			 * Fires immediately after updating a post's metadata.
 			 *
@@ -277,7 +277,7 @@ 
 			 * @param string $meta_key   Meta key.
 			 * @param mixed  $meta_value Meta value.
 			 */
-			do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+			do_action('updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value);
 		}
 	}
 
@@ -307,21 +307,21 @@ 
 function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false) {
 	global $wpdb;
 
-	if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) && ! $delete_all ) {
+	if ( ! $meta_type || ! $meta_key || ! is_numeric($object_id) && ! $delete_all) {
 		return false;
 	}
 
-	$object_id = absint( $object_id );
-	if ( ! $object_id && ! $delete_all ) {
+	$object_id = absint($object_id);
+	if ( ! $object_id && ! $delete_all) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
-	$type_column = sanitize_key($meta_type . '_id');
+	$type_column = sanitize_key($meta_type.'_id');
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 	// expected_slashed ($meta_key)
 	$meta_key = wp_unslash($meta_key);
@@ -344,32 +344,32 @@ 
 	 *                              for all objects, ignoring the specified $object_id.
 	 *                              Default false.
 	 */
-	$check = apply_filters( "delete_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $delete_all );
-	if ( null !== $check )
+	$check = apply_filters("delete_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $delete_all);
+	if (null !== $check)
 		return (bool) $check;
 
 	$_meta_value = $meta_value;
-	$meta_value = maybe_serialize( $meta_value );
+	$meta_value = maybe_serialize($meta_value);
 
-	$query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
+	$query = $wpdb->prepare("SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key);
 
-	if ( !$delete_all )
-		$query .= $wpdb->prepare(" AND $type_column = %d", $object_id );
+	if ( ! $delete_all)
+		$query .= $wpdb->prepare(" AND $type_column = %d", $object_id);
 
-	if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value )
-		$query .= $wpdb->prepare(" AND meta_value = %s", $meta_value );
+	if ('' !== $meta_value && null !== $meta_value && false !== $meta_value)
+		$query .= $wpdb->prepare(" AND meta_value = %s", $meta_value);
 
-	$meta_ids = $wpdb->get_col( $query );
-	if ( !count( $meta_ids ) )
+	$meta_ids = $wpdb->get_col($query);
+	if ( ! count($meta_ids))
 		return false;
 
-	if ( $delete_all ) {
+	if ($delete_all) {
 		$value_clause = '';
-		if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) {
-			$value_clause = $wpdb->prepare( " AND meta_value = %s", $meta_value );
+		if ('' !== $meta_value && null !== $meta_value && false !== $meta_value) {
+			$value_clause = $wpdb->prepare(" AND meta_value = %s", $meta_value);
 		}
 
-		$object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s $value_clause", $meta_key ) );
+		$object_ids = $wpdb->get_col($wpdb->prepare("SELECT $type_column FROM $table WHERE meta_key = %s $value_clause", $meta_key));
 	}
 
 	/**
@@ -385,10 +385,10 @@ 
 	 * @param string $meta_key   Meta key.
 	 * @param mixed  $meta_value Meta value.
 	 */
-	do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
+	do_action("delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value);
 
 	// Old-style action.
-	if ( 'post' == $meta_type ) {
+	if ('post' == $meta_type) {
 		/**
 		 * Fires immediately before deleting metadata for a post.
 		 *
@@ -396,22 +396,22 @@ 
 		 *
 		 * @param array $meta_ids An array of post metadata entry IDs to delete.
 		 */
-		do_action( 'delete_postmeta', $meta_ids );
+		do_action('delete_postmeta', $meta_ids);
 	}
 
-	$query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . " )";
+	$query = "DELETE FROM $table WHERE $id_column IN( ".implode(',', $meta_ids)." )";
 
 	$count = $wpdb->query($query);
 
-	if ( !$count )
+	if ( ! $count)
 		return false;
 
-	if ( $delete_all ) {
-		foreach ( (array) $object_ids as $o_id ) {
-			wp_cache_delete($o_id, $meta_type . '_meta');
+	if ($delete_all) {
+		foreach ((array) $object_ids as $o_id) {
+			wp_cache_delete($o_id, $meta_type.'_meta');
 		}
 	} else {
-		wp_cache_delete($object_id, $meta_type . '_meta');
+		wp_cache_delete($object_id, $meta_type.'_meta');
 	}
 
 	/**
@@ -427,10 +427,10 @@ 
 	 * @param string $meta_key   Meta key.
 	 * @param mixed  $meta_value Meta value.
 	 */
-	do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
+	do_action("deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value);
 
 	// Old-style action.
-	if ( 'post' == $meta_type ) {
+	if ('post' == $meta_type) {
 		/**
 		 * Fires immediately after deleting metadata for a post.
 		 *
@@ -438,7 +438,7 @@ 
 		 *
 		 * @param array $meta_ids An array of deleted post metadata entry IDs.
 		 */
-		do_action( 'deleted_postmeta', $meta_ids );
+		do_action('deleted_postmeta', $meta_ids);
 	}
 
 	return true;
@@ -459,12 +459,12 @@ 
  * @return mixed Single metadata value, or array of values
  */
 function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
-	if ( ! $meta_type || ! is_numeric( $object_id ) ) {
+	if ( ! $meta_type || ! is_numeric($object_id)) {
 		return false;
 	}
 
-	$object_id = absint( $object_id );
-	if ( ! $object_id ) {
+	$object_id = absint($object_id);
+	if ( ! $object_id) {
 		return false;
 	}
 
@@ -483,28 +483,28 @@ 
 	 * @param string            $meta_key  Meta key.
 	 * @param bool              $single    Whether to return only the first value of the specified $meta_key.
 	 */
-	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single );
-	if ( null !== $check ) {
-		if ( $single && is_array( $check ) )
+	$check = apply_filters("get_{$meta_type}_metadata", null, $object_id, $meta_key, $single);
+	if (null !== $check) {
+		if ($single && is_array($check))
 			return $check[0];
 		else
 			return $check;
 	}
 
-	$meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+	$meta_cache = wp_cache_get($object_id, $meta_type.'_meta');
 
-	if ( !$meta_cache ) {
-		$meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
+	if ( ! $meta_cache) {
+		$meta_cache = update_meta_cache($meta_type, array($object_id));
 		$meta_cache = $meta_cache[$object_id];
 	}
 
-	if ( ! $meta_key ) {
+	if ( ! $meta_key) {
 		return $meta_cache;
 	}
 
-	if ( isset($meta_cache[$meta_key]) ) {
-		if ( $single )
-			return maybe_unserialize( $meta_cache[$meta_key][0] );
+	if (isset($meta_cache[$meta_key])) {
+		if ($single)
+			return maybe_unserialize($meta_cache[$meta_key][0]);
 		else
 			return array_map('maybe_unserialize', $meta_cache[$meta_key]);
 	}
@@ -525,29 +525,29 @@ 
  * @param string $meta_key  Metadata key.
  * @return bool True of the key is set, false if not.
  */
-function metadata_exists( $meta_type, $object_id, $meta_key ) {
-	if ( ! $meta_type || ! is_numeric( $object_id ) ) {
+function metadata_exists($meta_type, $object_id, $meta_key) {
+	if ( ! $meta_type || ! is_numeric($object_id)) {
 		return false;
 	}
 
-	$object_id = absint( $object_id );
-	if ( ! $object_id ) {
+	$object_id = absint($object_id);
+	if ( ! $object_id) {
 		return false;
 	}
 
 	/** This filter is documented in wp-includes/meta.php */
-	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true );
-	if ( null !== $check )
+	$check = apply_filters("get_{$meta_type}_metadata", null, $object_id, $meta_key, true);
+	if (null !== $check)
 		return (bool) $check;
 
-	$meta_cache = wp_cache_get( $object_id, $meta_type . '_meta' );
+	$meta_cache = wp_cache_get($object_id, $meta_type.'_meta');
 
-	if ( !$meta_cache ) {
-		$meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
+	if ( ! $meta_cache) {
+		$meta_cache = update_meta_cache($meta_type, array($object_id));
 		$meta_cache = $meta_cache[$object_id];
 	}
 
-	if ( isset( $meta_cache[ $meta_key ] ) )
+	if (isset($meta_cache[$meta_key]))
 		return true;
 
 	return false;
@@ -564,32 +564,32 @@ 
  * @param int    $meta_id   ID for a specific meta row
  * @return object|false Meta object or false.
  */
-function get_metadata_by_mid( $meta_type, $meta_id ) {
+function get_metadata_by_mid($meta_type, $meta_id) {
 	global $wpdb;
 
-	if ( ! $meta_type || ! is_numeric( $meta_id ) ) {
+	if ( ! $meta_type || ! is_numeric($meta_id)) {
 		return false;
 	}
 
-	$meta_id = absint( $meta_id );
-	if ( ! $meta_id ) {
+	$meta_id = absint($meta_id);
+	if ( ! $meta_id) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
-	$id_column = ( 'user' == $meta_type ) ? 'umeta_id' : 'meta_id';
+	$id_column = ('user' == $meta_type) ? 'umeta_id' : 'meta_id';
 
-	$meta = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $table WHERE $id_column = %d", $meta_id ) );
+	$meta = $wpdb->get_row($wpdb->prepare("SELECT * FROM $table WHERE $id_column = %d", $meta_id));
 
-	if ( empty( $meta ) )
+	if (empty($meta))
 		return false;
 
-	if ( isset( $meta->meta_value ) )
-		$meta->meta_value = maybe_unserialize( $meta->meta_value );
+	if (isset($meta->meta_value))
+		$meta->meta_value = maybe_unserialize($meta->meta_value);
 
 	return $meta;
 }
@@ -607,44 +607,44 @@ 
  * @param string $meta_key   Optional, you can provide a meta key to update it
  * @return bool True on successful update, false on failure.
  */
-function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key = false ) {
+function update_metadata_by_mid($meta_type, $meta_id, $meta_value, $meta_key = false) {
 	global $wpdb;
 
 	// Make sure everything is valid.
-	if ( ! $meta_type || ! is_numeric( $meta_id ) ) {
+	if ( ! $meta_type || ! is_numeric($meta_id)) {
 		return false;
 	}
 
-	$meta_id = absint( $meta_id );
-	if ( ! $meta_id ) {
+	$meta_id = absint($meta_id);
+	if ( ! $meta_id) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key($meta_type.'_id');
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
 	// Fetch the meta and go on if it's found.
-	if ( $meta = get_metadata_by_mid( $meta_type, $meta_id ) ) {
+	if ($meta = get_metadata_by_mid($meta_type, $meta_id)) {
 		$original_key = $meta->meta_key;
 		$object_id = $meta->{$column};
 
 		// If a new meta_key (last parameter) was specified, change the meta key,
 		// otherwise use the original key in the update statement.
-		if ( false === $meta_key ) {
+		if (false === $meta_key) {
 			$meta_key = $original_key;
-		} elseif ( ! is_string( $meta_key ) ) {
+		} elseif ( ! is_string($meta_key)) {
 			return false;
 		}
 
 		// Sanitize the meta
 		$_meta_value = $meta_value;
-		$meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type );
-		$meta_value = maybe_serialize( $meta_value );
+		$meta_value = sanitize_meta($meta_key, $meta_value, $meta_type);
+		$meta_value = maybe_serialize($meta_value);
 
 		// Format the data query arguments.
 		$data = array(
@@ -657,27 +657,27 @@ 
 		$where[$id_column] = $meta_id;
 
 		/** This action is documented in wp-includes/meta.php */
-		do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+		do_action("update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value);
 
-		if ( 'post' == $meta_type ) {
+		if ('post' == $meta_type) {
 			/** This action is documented in wp-includes/meta.php */
-			do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+			do_action('update_postmeta', $meta_id, $object_id, $meta_key, $meta_value);
 		}
 
 		// Run the update query, all fields in $data are %s, $where is a %d.
-		$result = $wpdb->update( $table, $data, $where, '%s', '%d' );
-		if ( ! $result )
+		$result = $wpdb->update($table, $data, $where, '%s', '%d');
+		if ( ! $result)
 			return false;
 
 		// Clear the caches.
-		wp_cache_delete($object_id, $meta_type . '_meta');
+		wp_cache_delete($object_id, $meta_type.'_meta');
 
 		/** This action is documented in wp-includes/meta.php */
-		do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+		do_action("updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value);
 
-		if ( 'post' == $meta_type ) {
+		if ('post' == $meta_type) {
 			/** This action is documented in wp-includes/meta.php */
-			do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+			do_action('updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value);
 		}
 
 		return true;
@@ -698,37 +698,37 @@ 
  * @param int    $meta_id   ID for a specific meta row
  * @return bool True on successful delete, false on failure.
  */
-function delete_metadata_by_mid( $meta_type, $meta_id ) {
+function delete_metadata_by_mid($meta_type, $meta_id) {
 	global $wpdb;
 
 	// Make sure everything is valid.
-	if ( ! $meta_type || ! is_numeric( $meta_id ) ) {
+	if ( ! $meta_type || ! is_numeric($meta_id)) {
 		return false;
 	}
 
-	$meta_id = absint( $meta_id );
-	if ( ! $meta_id ) {
+	$meta_id = absint($meta_id);
+	if ( ! $meta_id) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
 	// object and id columns
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key($meta_type.'_id');
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
 	// Fetch the meta and go on if it's found.
-	if ( $meta = get_metadata_by_mid( $meta_type, $meta_id ) ) {
+	if ($meta = get_metadata_by_mid($meta_type, $meta_id)) {
 		$object_id = $meta->{$column};
 
 		/** This action is documented in wp-includes/meta.php */
-		do_action( "delete_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
+		do_action("delete_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value);
 
 		// Old-style action.
-		if ( 'post' == $meta_type || 'comment' == $meta_type ) {
+		if ('post' == $meta_type || 'comment' == $meta_type) {
 			/**
 			 * Fires immediately before deleting post or comment metadata of a specific type.
 			 *
@@ -739,20 +739,20 @@ 
 			 *
 			 * @param int $meta_id ID of the metadata entry to delete.
 			 */
-			do_action( "delete_{$meta_type}meta", $meta_id );
+			do_action("delete_{$meta_type}meta", $meta_id);
 		}
 
 		// Run the query, will return true if deleted, false otherwise
-		$result = (bool) $wpdb->delete( $table, array( $id_column => $meta_id ) );
+		$result = (bool) $wpdb->delete($table, array($id_column => $meta_id));
 
 		// Clear the caches.
-		wp_cache_delete($object_id, $meta_type . '_meta');
+		wp_cache_delete($object_id, $meta_type.'_meta');
 
 		/** This action is documented in wp-includes/meta.php */
-		do_action( "deleted_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
+		do_action("deleted_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value);
 
 		// Old-style action.
-		if ( 'post' == $meta_type || 'comment' == $meta_type ) {
+		if ('post' == $meta_type || 'comment' == $meta_type) {
 			/**
 			 * Fires immediately after deleting post or comment metadata of a specific type.
 			 *
@@ -763,7 +763,7 @@ 
 			 *
 			 * @param int $meta_ids Deleted metadata entry ID.
 			 */
-			do_action( "deleted_{$meta_type}meta", $meta_id );
+			do_action("deleted_{$meta_type}meta", $meta_id);
 		}
 
 		return $result;
@@ -788,53 +788,53 @@ 
 function update_meta_cache($meta_type, $object_ids) {
 	global $wpdb;
 
-	if ( ! $meta_type || ! $object_ids ) {
+	if ( ! $meta_type || ! $object_ids) {
 		return false;
 	}
 
-	$table = _get_meta_table( $meta_type );
-	if ( ! $table ) {
+	$table = _get_meta_table($meta_type);
+	if ( ! $table) {
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key($meta_type.'_id');
 
-	if ( !is_array($object_ids) ) {
+	if ( ! is_array($object_ids)) {
 		$object_ids = preg_replace('|[^0-9,]|', '', $object_ids);
 		$object_ids = explode(',', $object_ids);
 	}
 
 	$object_ids = array_map('intval', $object_ids);
 
-	$cache_key = $meta_type . '_meta';
+	$cache_key = $meta_type.'_meta';
 	$ids = array();
 	$cache = array();
-	foreach ( $object_ids as $id ) {
-		$cached_object = wp_cache_get( $id, $cache_key );
-		if ( false === $cached_object )
+	foreach ($object_ids as $id) {
+		$cached_object = wp_cache_get($id, $cache_key);
+		if (false === $cached_object)
 			$ids[] = $id;
 		else
 			$cache[$id] = $cached_object;
 	}
 
-	if ( empty( $ids ) )
+	if (empty($ids))
 		return $cache;
 
 	// Get meta info
-	$id_list = join( ',', $ids );
+	$id_list = join(',', $ids);
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
-	$meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
+	$meta_list = $wpdb->get_results("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A);
 
-	if ( !empty($meta_list) ) {
-		foreach ( $meta_list as $metarow) {
+	if ( ! empty($meta_list)) {
+		foreach ($meta_list as $metarow) {
 			$mpid = intval($metarow[$column]);
 			$mkey = $metarow['meta_key'];
 			$mval = $metarow['meta_value'];
 
 			// Force subkeys to be array type:
-			if ( !isset($cache[$mpid]) || !is_array($cache[$mpid]) )
+			if ( ! isset($cache[$mpid]) || ! is_array($cache[$mpid]))
 				$cache[$mpid] = array();
-			if ( !isset($cache[$mpid][$mkey]) || !is_array($cache[$mpid][$mkey]) )
+			if ( ! isset($cache[$mpid][$mkey]) || ! is_array($cache[$mpid][$mkey]))
 				$cache[$mpid][$mkey] = array();
 
 			// Add a value to the current pid/key:
@@ -842,10 +842,10 @@ 
 		}
 	}
 
-	foreach ( $ids as $id ) {
-		if ( ! isset($cache[$id]) )
+	foreach ($ids as $id) {
+		if ( ! isset($cache[$id]))
 			$cache[$id] = array();
-		wp_cache_add( $id, $cache[$id], $cache_key );
+		wp_cache_add($id, $cache[$id], $cache_key);
 	}
 
 	return $cache;
@@ -861,7 +861,7 @@ 
 function wp_metadata_lazyloader() {
 	static $wp_metadata_lazyloader;
 
-	if ( null === $wp_metadata_lazyloader ) {
+	if (null === $wp_metadata_lazyloader) {
 		$wp_metadata_lazyloader = new WP_Metadata_Lazyloader();
 	}
 
@@ -882,9 +882,9 @@ 
  * @param object $context           Optional. The main query object
  * @return array Associative array of `JOIN` and `WHERE` SQL.
  */
-function get_meta_sql( $meta_query, $type, $primary_table, $primary_id_column, $context = null ) {
-	$meta_query_obj = new WP_Meta_Query( $meta_query );
-	return $meta_query_obj->get_sql( $type, $primary_table, $primary_id_column, $context );
+function get_meta_sql($meta_query, $type, $primary_table, $primary_id_column, $context = null) {
+	$meta_query_obj = new WP_Meta_Query($meta_query);
+	return $meta_query_obj->get_sql($type, $primary_table, $primary_id_column, $context);
 }
 
 /**
@@ -900,9 +900,9 @@ 
 function _get_meta_table($type) {
 	global $wpdb;
 
-	$table_name = $type . 'meta';
+	$table_name = $type.'meta';
 
-	if ( empty($wpdb->$table_name) )
+	if (empty($wpdb->$table_name))
 		return false;
 
 	return $wpdb->$table_name;
@@ -917,8 +917,8 @@ 
  * @param string|null $meta_type
  * @return bool True if the key is protected, false otherwise.
  */
-function is_protected_meta( $meta_key, $meta_type = null ) {
-	$protected = ( '_' == $meta_key[0] );
+function is_protected_meta($meta_key, $meta_type = null) {
+	$protected = ('_' == $meta_key[0]);
 
 	/**
 	 * Filter whether a meta key is protected.
@@ -929,7 +929,7 @@ 
 	 * @param string $meta_key  Meta key.
 	 * @param string $meta_type Meta type.
 	 */
-	return apply_filters( 'is_protected_meta', $protected, $meta_key, $meta_type );
+	return apply_filters('is_protected_meta', $protected, $meta_key, $meta_type);
 }
 
 /**
@@ -942,7 +942,7 @@ 
  * @param string $meta_type  Type of meta
  * @return mixed Sanitized $meta_value
  */
-function sanitize_meta( $meta_key, $meta_value, $meta_type ) {
+function sanitize_meta($meta_key, $meta_value, $meta_type) {
 
 	/**
 	 * Filter the sanitization of a specific meta key of a specific meta type.
@@ -958,7 +958,7 @@ 
 	 * @param string $meta_key   Meta key.
 	 * @param string $meta_type  Meta type.
 	 */
-	return apply_filters( "sanitize_{$meta_type}_meta_{$meta_key}", $meta_value, $meta_key, $meta_type );
+	return apply_filters("sanitize_{$meta_type}_meta_{$meta_key}", $meta_value, $meta_key, $meta_type);
 }
 
 /**
@@ -971,17 +971,17 @@ 
  * @param string|array $sanitize_callback A function or method to call when sanitizing the value of $meta_key.
  * @param string|array $auth_callback     Optional. A function or method to call when performing edit_post_meta, add_post_meta, and delete_post_meta capability checks.
  */
-function register_meta( $meta_type, $meta_key, $sanitize_callback, $auth_callback = null ) {
-	if ( is_callable( $sanitize_callback ) )
-		add_filter( "sanitize_{$meta_type}_meta_{$meta_key}", $sanitize_callback, 10, 3 );
+function register_meta($meta_type, $meta_key, $sanitize_callback, $auth_callback = null) {
+	if (is_callable($sanitize_callback))
+		add_filter("sanitize_{$meta_type}_meta_{$meta_key}", $sanitize_callback, 10, 3);
 
-	if ( empty( $auth_callback ) ) {
-		if ( is_protected_meta( $meta_key, $meta_type ) )
+	if (empty($auth_callback)) {
+		if (is_protected_meta($meta_key, $meta_type))
 			$auth_callback = '__return_false';
 		else
 			$auth_callback = '__return_true';
 	}
 
-	if ( is_callable( $auth_callback ) )
-		add_filter( "auth_{$meta_type}_meta_{$meta_key}", $auth_callback, 10, 6 );
+	if (is_callable($auth_callback))
+		add_filter("auth_{$meta_type}_meta_{$meta_key}", $auth_callback, 10, 6);
 }

Braces +96 added lines, -68 removed lines

@@ -68,13 +68,15 @@ 
 	 *                              for the object. Optional. Default false.
 	 */
 	$check = apply_filters( "add_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $unique );
-	if ( null !== $check )
-		return $check;
+	if ( null !== $check ) {
+			return $check;
+	}
 
 	if ( $unique && $wpdb->get_var( $wpdb->prepare(
 		"SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
-		$meta_key, $object_id ) ) )
-		return false;
+		$meta_key, $object_id ) ) ) {
+			return false;
+	}
 
 	$_meta_value = $meta_value;
 	$meta_value = maybe_serialize( $meta_value );
@@ -99,8 +101,9 @@ 
 		'meta_value' => $meta_value
 	) );
 
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$mid = (int) $wpdb->insert_id;
 
@@ -185,15 +188,17 @@ 
 	 *                              Otherwise, update all entries.
 	 */
 	$check = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $prev_value );
-	if ( null !== $check )
-		return (bool) $check;
+	if ( null !== $check ) {
+			return (bool) $check;
+	}
 
 	// Compare existing value to new value if no prev value given and the key exists only once.
 	if ( empty($prev_value) ) {
 		$old_value = get_metadata($meta_type, $object_id, $meta_key);
 		if ( count($old_value) == 1 ) {
-			if ( $old_value[0] === $meta_value )
-				return false;
+			if ( $old_value[0] === $meta_value ) {
+							return false;
+			}
 		}
 	}
 
@@ -245,8 +250,9 @@ 
 	}
 
 	$result = $wpdb->update( $table, $data, $where );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	wp_cache_delete($object_id, $meta_type . '_meta');
 
@@ -345,23 +351,27 @@ 
 	 *                              Default false.
 	 */
 	$check = apply_filters( "delete_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $delete_all );
-	if ( null !== $check )
-		return (bool) $check;
+	if ( null !== $check ) {
+			return (bool) $check;
+	}
 
 	$_meta_value = $meta_value;
 	$meta_value = maybe_serialize( $meta_value );
 
 	$query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
 
-	if ( !$delete_all )
-		$query .= $wpdb->prepare(" AND $type_column = %d", $object_id );
+	if ( !$delete_all ) {
+			$query .= $wpdb->prepare(" AND $type_column = %d", $object_id );
+	}
 
-	if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value )
-		$query .= $wpdb->prepare(" AND meta_value = %s", $meta_value );
+	if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) {
+			$query .= $wpdb->prepare(" AND meta_value = %s", $meta_value );
+	}
 
 	$meta_ids = $wpdb->get_col( $query );
-	if ( !count( $meta_ids ) )
-		return false;
+	if ( !count( $meta_ids ) ) {
+			return false;
+	}
 
 	if ( $delete_all ) {
 		$value_clause = '';
@@ -403,8 +413,9 @@ 
 
 	$count = $wpdb->query($query);
 
-	if ( !$count )
-		return false;
+	if ( !$count ) {
+			return false;
+	}
 
 	if ( $delete_all ) {
 		foreach ( (array) $object_ids as $o_id ) {
@@ -485,10 +496,11 @@ 
 	 */
 	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single );
 	if ( null !== $check ) {
-		if ( $single && is_array( $check ) )
-			return $check[0];
-		else
-			return $check;
+		if ( $single && is_array( $check ) ) {
+					return $check[0];
+		} else {
+					return $check;
+		}
 	}
 
 	$meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
@@ -503,17 +515,19 @@ 
 	}
 
 	if ( isset($meta_cache[$meta_key]) ) {
-		if ( $single )
-			return maybe_unserialize( $meta_cache[$meta_key][0] );
-		else
-			return array_map('maybe_unserialize', $meta_cache[$meta_key]);
+		if ( $single ) {
+					return maybe_unserialize( $meta_cache[$meta_key][0] );
+		} else {
+					return array_map('maybe_unserialize', $meta_cache[$meta_key]);
+		}
 	}
 
-	if ($single)
-		return '';
-	else
-		return array();
-}
+	if ($single) {
+			return '';
+	} else {
+			return array();
+	}
+	}
 
 /**
  * Determine if a meta key is set for a given object
@@ -537,8 +551,9 @@ 
 
 	/** This filter is documented in wp-includes/meta.php */
 	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true );
-	if ( null !== $check )
-		return (bool) $check;
+	if ( null !== $check ) {
+			return (bool) $check;
+	}
 
 	$meta_cache = wp_cache_get( $object_id, $meta_type . '_meta' );
 
@@ -547,8 +562,9 @@ 
 		$meta_cache = $meta_cache[$object_id];
 	}
 
-	if ( isset( $meta_cache[ $meta_key ] ) )
-		return true;
+	if ( isset( $meta_cache[ $meta_key ] ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -585,11 +601,13 @@ 
 
 	$meta = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $table WHERE $id_column = %d", $meta_id ) );
 
-	if ( empty( $meta ) )
-		return false;
+	if ( empty( $meta ) ) {
+			return false;
+	}
 
-	if ( isset( $meta->meta_value ) )
-		$meta->meta_value = maybe_unserialize( $meta->meta_value );
+	if ( isset( $meta->meta_value ) ) {
+			$meta->meta_value = maybe_unserialize( $meta->meta_value );
+	}
 
 	return $meta;
 }
@@ -666,8 +684,9 @@ 
 
 		// Run the update query, all fields in $data are %s, $where is a %d.
 		$result = $wpdb->update( $table, $data, $where, '%s', '%d' );
-		if ( ! $result )
-			return false;
+		if ( ! $result ) {
+					return false;
+		}
 
 		// Clear the caches.
 		wp_cache_delete($object_id, $meta_type . '_meta');
@@ -811,14 +830,16 @@ 
 	$cache = array();
 	foreach ( $object_ids as $id ) {
 		$cached_object = wp_cache_get( $id, $cache_key );
-		if ( false === $cached_object )
-			$ids[] = $id;
-		else
-			$cache[$id] = $cached_object;
+		if ( false === $cached_object ) {
+					$ids[] = $id;
+		} else {
+					$cache[$id] = $cached_object;
+		}
 	}
 
-	if ( empty( $ids ) )
-		return $cache;
+	if ( empty( $ids ) ) {
+			return $cache;
+	}
 
 	// Get meta info
 	$id_list = join( ',', $ids );
@@ -832,10 +853,12 @@ 
 			$mval = $metarow['meta_value'];
 
 			// Force subkeys to be array type:
-			if ( !isset($cache[$mpid]) || !is_array($cache[$mpid]) )
-				$cache[$mpid] = array();
-			if ( !isset($cache[$mpid][$mkey]) || !is_array($cache[$mpid][$mkey]) )
-				$cache[$mpid][$mkey] = array();
+			if ( !isset($cache[$mpid]) || !is_array($cache[$mpid]) ) {
+							$cache[$mpid] = array();
+			}
+			if ( !isset($cache[$mpid][$mkey]) || !is_array($cache[$mpid][$mkey]) ) {
+							$cache[$mpid][$mkey] = array();
+			}
 
 			// Add a value to the current pid/key:
 			$cache[$mpid][$mkey][] = $mval;
@@ -843,8 +866,9 @@ 
 	}
 
 	foreach ( $ids as $id ) {
-		if ( ! isset($cache[$id]) )
-			$cache[$id] = array();
+		if ( ! isset($cache[$id]) ) {
+					$cache[$id] = array();
+		}
 		wp_cache_add( $id, $cache[$id], $cache_key );
 	}
 
@@ -902,8 +926,9 @@ 
 
 	$table_name = $type . 'meta';
 
-	if ( empty($wpdb->$table_name) )
-		return false;
+	if ( empty($wpdb->$table_name) ) {
+			return false;
+	}
 
 	return $wpdb->$table_name;
 }
@@ -972,16 +997,19 @@ 
  * @param string|array $auth_callback     Optional. A function or method to call when performing edit_post_meta, add_post_meta, and delete_post_meta capability checks.
  */
 function register_meta( $meta_type, $meta_key, $sanitize_callback, $auth_callback = null ) {
-	if ( is_callable( $sanitize_callback ) )
-		add_filter( "sanitize_{$meta_type}_meta_{$meta_key}", $sanitize_callback, 10, 3 );
+	if ( is_callable( $sanitize_callback ) ) {
+			add_filter( "sanitize_{$meta_type}_meta_{$meta_key}", $sanitize_callback, 10, 3 );
+	}
 
 	if ( empty( $auth_callback ) ) {
-		if ( is_protected_meta( $meta_key, $meta_type ) )
-			$auth_callback = '__return_false';
-		else
-			$auth_callback = '__return_true';
+		if ( is_protected_meta( $meta_key, $meta_type ) ) {
+					$auth_callback = '__return_false';
+		} else {
+					$auth_callback = '__return_true';
+		}
 	}
 
-	if ( is_callable( $auth_callback ) )
-		add_filter( "auth_{$meta_type}_meta_{$meta_key}", $auth_callback, 10, 6 );
-}
+	if ( is_callable( $auth_callback ) ) {
+			add_filter( "auth_{$meta_type}_meta_{$meta_key}", $auth_callback, 10, 6 );
+	}
+	}

src/wp-includes/admin-bar.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Toolbar API: Top-level Toolbar functionality
- *
- * @package WordPress
- * @subpackage Toolbar
- * @since 3.1.0
- */
+	 * Toolbar API: Top-level Toolbar functionality
+	 *
+	 * @package WordPress
+	 * @subpackage Toolbar
+	 * @since 3.1.0
+	 */
 
 /**
  * Instantiate the admin bar object and set it up as a global for access elsewhere.

Spacing +299 added lines, -299 removed lines

@@ -23,11 +23,11 @@ 
 function _wp_admin_bar_init() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() )
+	if ( ! is_admin_bar_showing())
 		return false;
 
 	/* Load the admin bar class code ready for instantiation */
-	require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
+	require_once(ABSPATH.WPINC.'/class-wp-admin-bar.php');
 
 	/* Instantiate the admin bar */
 
@@ -38,8 +38,8 @@ 
 	 *
 	 * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
 	 */
-	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-	if ( class_exists( $admin_bar_class ) )
+	$admin_bar_class = apply_filters('wp_admin_bar_class', 'WP_Admin_Bar');
+	if (class_exists($admin_bar_class))
 		$wp_admin_bar = new $admin_bar_class;
 	else
 		return false;
@@ -66,7 +66,7 @@ 
 function wp_admin_bar_render() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
+	if ( ! is_admin_bar_showing() || ! is_object($wp_admin_bar))
 		return;
 
 	/**
@@ -78,14 +78,14 @@ 
 	 *
 	 * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
 	 */
-	do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+	do_action_ref_array('admin_bar_menu', array(&$wp_admin_bar));
 
 	/**
 	 * Fires before the admin bar is rendered.
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'wp_before_admin_bar_render' );
+	do_action('wp_before_admin_bar_render');
 
 	$wp_admin_bar->render();
 
@@ -94,7 +94,7 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'wp_after_admin_bar_render' );
+	do_action('wp_after_admin_bar_render');
 }
 
 /**
@@ -104,54 +104,54 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_wp_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_menu( array(
+function wp_admin_bar_wp_menu($wp_admin_bar) {
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'wp-logo',
-		'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
-		'href'  => self_admin_url( 'about.php' ),
-	) );
+		'title' => '<span class="ab-icon"></span><span class="screen-reader-text">'.__('About WordPress').'</span>',
+		'href'  => self_admin_url('about.php'),
+	));
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Add "About WordPress" link
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'wp-logo',
 			'id'     => 'about',
 			'title'  => __('About WordPress'),
-			'href'   => self_admin_url( 'about.php' ),
-		) );
+			'href'   => self_admin_url('about.php'),
+		));
 	}
 
 	// Add WordPress.org link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'wporg',
 		'title'     => __('WordPress.org'),
 		'href'      => __('https://wordpress.org/'),
-	) );
+	));
 
 	// Add codex link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'documentation',
 		'title'     => __('Documentation'),
 		'href'      => __('https://codex.wordpress.org/'),
-	) );
+	));
 
 	// Add forums link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'support-forums',
 		'title'     => __('Support Forums'),
 		'href'      => __('https://wordpress.org/support/'),
-	) );
+	));
 
 	// Add feedback link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'feedback',
 		'title'     => __('Feedback'),
 		'href'      => __('https://wordpress.org/support/forum/requests-and-feedback'),
-	) );
+	));
 }
 
 /**
@@ -161,13 +161,13 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
-	if ( is_admin() ) {
-		$wp_admin_bar->add_menu( array(
+function wp_admin_bar_sidebar_toggle($wp_admin_bar) {
+	if (is_admin()) {
+		$wp_admin_bar->add_menu(array(
 			'id'    => 'menu-toggle',
-			'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
+			'title' => '<span class="ab-icon"></span><span class="screen-reader-text">'.__('Menu').'</span>',
 			'href'  => '#',
-		) );
+		));
 	}
 }
 
@@ -178,34 +178,34 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_my_account_item( $wp_admin_bar ) {
+function wp_admin_bar_my_account_item($wp_admin_bar) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return;
 
-	if ( current_user_can( 'read' ) ) {
-		$profile_url = get_edit_profile_url( $user_id );
-	} elseif ( is_multisite() ) {
-		$profile_url = get_dashboard_url( $user_id, 'profile.php' );
+	if (current_user_can('read')) {
+		$profile_url = get_edit_profile_url($user_id);
+	} elseif (is_multisite()) {
+		$profile_url = get_dashboard_url($user_id, 'profile.php');
 	} else {
 		$profile_url = false;
 	}
 
-	$avatar = get_avatar( $user_id, 26 );
-	$howdy  = sprintf( __('Howdy, %1$s'), $current_user->display_name );
-	$class  = empty( $avatar ) ? '' : 'with-avatar';
+	$avatar = get_avatar($user_id, 26);
+	$howdy  = sprintf(__('Howdy, %1$s'), $current_user->display_name);
+	$class  = empty($avatar) ? '' : 'with-avatar';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'        => 'my-account',
 		'parent'    => 'top-secondary',
-		'title'     => $howdy . $avatar,
+		'title'     => $howdy.$avatar,
 		'href'      => $profile_url,
 		'meta'      => array(
 			'class'     => $class,
 		),
-	) );
+	));
 }
 
 /**
@@ -215,33 +215,33 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
+function wp_admin_bar_my_account_menu($wp_admin_bar) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return;
 
-	if ( current_user_can( 'read' ) ) {
-		$profile_url = get_edit_profile_url( $user_id );
-	} elseif ( is_multisite() ) {
-		$profile_url = get_dashboard_url( $user_id, 'profile.php' );
+	if (current_user_can('read')) {
+		$profile_url = get_edit_profile_url($user_id);
+	} elseif (is_multisite()) {
+		$profile_url = get_dashboard_url($user_id, 'profile.php');
 	} else {
 		$profile_url = false;
 	}
 
-	$wp_admin_bar->add_group( array(
+	$wp_admin_bar->add_group(array(
 		'parent' => 'my-account',
 		'id'     => 'user-actions',
-	) );
+	));
 
-	$user_info  = get_avatar( $user_id, 64 );
+	$user_info  = get_avatar($user_id, 64);
 	$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
 
-	if ( $current_user->display_name !== $current_user->user_login )
+	if ($current_user->display_name !== $current_user->user_login)
 		$user_info .= "<span class='username'>{$current_user->user_login}</span>";
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent' => 'user-actions',
 		'id'     => 'user-info',
 		'title'  => $user_info,
@@ -249,23 +249,23 @@ 
 		'meta'   => array(
 			'tabindex' => -1,
 		),
-	) );
+	));
 
-	if ( false !== $profile_url ) {
-		$wp_admin_bar->add_menu( array(
+	if (false !== $profile_url) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'user-actions',
 			'id'     => 'edit-profile',
-			'title'  => __( 'Edit My Profile' ),
+			'title'  => __('Edit My Profile'),
 			'href'   => $profile_url,
-		) );
+		));
 	}
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent' => 'user-actions',
 		'id'     => 'logout',
-		'title'  => __( 'Log Out' ),
+		'title'  => __('Log Out'),
 		'href'   => wp_logout_url(),
-	) );
+	));
 }
 
 /**
@@ -275,66 +275,66 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_site_menu( $wp_admin_bar ) {
+function wp_admin_bar_site_menu($wp_admin_bar) {
 	// Don't show for logged out users.
-	if ( ! is_user_logged_in() )
+	if ( ! is_user_logged_in())
 		return;
 
 	// Show only when the user is a member of this site, or they're a super admin.
-	if ( ! is_user_member_of_blog() && ! is_super_admin() )
+	if ( ! is_user_member_of_blog() && ! is_super_admin())
 		return;
 
 	$blogname = get_bloginfo('name');
 
-	if ( ! $blogname ) {
-		$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+	if ( ! $blogname) {
+		$blogname = preg_replace('#^(https?://)?(www.)?#', '', get_home_url());
 	}
 
-	if ( is_network_admin() ) {
-		$blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
-	} elseif ( is_user_admin() ) {
-		$blogname = sprintf( __('User Dashboard: %s'), esc_html( get_current_site()->site_name ) );
+	if (is_network_admin()) {
+		$blogname = sprintf(__('Network Admin: %s'), esc_html(get_current_site()->site_name));
+	} elseif (is_user_admin()) {
+		$blogname = sprintf(__('User Dashboard: %s'), esc_html(get_current_site()->site_name));
 	}
 
-	$title = wp_html_excerpt( $blogname, 40, '&hellip;' );
+	$title = wp_html_excerpt($blogname, 40, '&hellip;');
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'site-name',
 		'title' => $title,
-		'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
-	) );
+		'href'  => (is_admin() || ! current_user_can('read')) ? home_url('/') : admin_url(),
+	));
 
 	// Create submenu items.
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		// Add an option to visit the site.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'site-name',
 			'id'     => 'view-site',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
+			'title'  => __('Visit Site'),
+			'href'   => home_url('/'),
+		));
 
-		if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {
-			$wp_admin_bar->add_menu( array(
+		if (is_blog_admin() && is_multisite() && current_user_can('manage_sites')) {
+			$wp_admin_bar->add_menu(array(
 				'parent' => 'site-name',
 				'id'     => 'edit-site',
-				'title'  => __( 'Edit Site' ),
-				'href'   => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),
-			) );
+				'title'  => __('Edit Site'),
+				'href'   => network_admin_url('site-info.php?id='.get_current_blog_id()),
+			));
 		}
 
-	} else if ( current_user_can( 'read' ) ) {
+	} else if (current_user_can('read')) {
 		// We're on the front end, link to the Dashboard.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'site-name',
 			'id'     => 'dashboard',
-			'title'  => __( 'Dashboard' ),
+			'title'  => __('Dashboard'),
 			'href'   => admin_url(),
-		) );
+		));
 
 		// Add the appearance submenu items.
-		wp_admin_bar_appearance_menu( $wp_admin_bar );
+		wp_admin_bar_appearance_menu($wp_admin_bar);
 	}
 }
 
@@ -345,24 +345,24 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
  */
-function wp_admin_bar_customize_menu( $wp_admin_bar ) {
+function wp_admin_bar_customize_menu($wp_admin_bar) {
 	// Don't show for users who can't access the customizer or when in the admin.
-	if ( ! current_user_can( 'customize' ) || is_admin() ) {
+	if ( ! current_user_can('customize') || is_admin()) {
 		return;
 	}
 
-	$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-	$customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+	$current_url = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+	$customize_url = add_query_arg('url', urlencode($current_url), wp_customize_url());
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'     => 'customize',
-		'title'  => __( 'Customize' ),
+		'title'  => __('Customize'),
 		'href'   => $customize_url,
 		'meta'   => array(
 			'class' => 'hide-if-no-customize',
 		),
-	) );
-	add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+	));
+	add_action('wp_before_admin_bar_render', 'wp_customize_support_script');
 }
 
 /**
@@ -372,138 +372,138 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
+function wp_admin_bar_my_sites_menu($wp_admin_bar) {
 	// Don't show for logged out users or single site mode.
-	if ( ! is_user_logged_in() || ! is_multisite() )
+	if ( ! is_user_logged_in() || ! is_multisite())
 		return;
 
 	// Show only when the user has at least one site, or they're a super admin.
-	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
+	if (count($wp_admin_bar->user->blogs) < 1 && ! is_super_admin())
 		return;
 
-	if ( $wp_admin_bar->user->active_blog ) {
-		$my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' );
+	if ($wp_admin_bar->user->active_blog) {
+		$my_sites_url = get_admin_url($wp_admin_bar->user->active_blog->blog_id, 'my-sites.php');
 	} else {
-		$my_sites_url = admin_url( 'my-sites.php' );
+		$my_sites_url = admin_url('my-sites.php');
 	}
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'my-sites',
-		'title' => __( 'My Sites' ),
+		'title' => __('My Sites'),
 		'href'  => $my_sites_url,
-	) );
+	));
 
-	if ( is_super_admin() ) {
-		$wp_admin_bar->add_group( array(
+	if (is_super_admin()) {
+		$wp_admin_bar->add_group(array(
 			'parent' => 'my-sites',
 			'id'     => 'my-sites-super-admin',
-		) );
+		));
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'my-sites-super-admin',
 			'id'     => 'network-admin',
 			'title'  => __('Network Admin'),
 			'href'   => network_admin_url(),
-		) );
+		));
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-d',
-			'title'  => __( 'Dashboard' ),
+			'title'  => __('Dashboard'),
 			'href'   => network_admin_url(),
-		) );
-		$wp_admin_bar->add_menu( array(
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-s',
-			'title'  => __( 'Sites' ),
-			'href'   => network_admin_url( 'sites.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Sites'),
+			'href'   => network_admin_url('sites.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-u',
-			'title'  => __( 'Users' ),
-			'href'   => network_admin_url( 'users.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Users'),
+			'href'   => network_admin_url('users.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-t',
-			'title'  => __( 'Themes' ),
-			'href'   => network_admin_url( 'themes.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Themes'),
+			'href'   => network_admin_url('themes.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-p',
-			'title'  => __( 'Plugins' ),
-			'href'   => network_admin_url( 'plugins.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Plugins'),
+			'href'   => network_admin_url('plugins.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-o',
-			'title'  => __( 'Settings' ),
-			'href'   => network_admin_url( 'settings.php' ),
-		) );
+			'title'  => __('Settings'),
+			'href'   => network_admin_url('settings.php'),
+		));
 	}
 
 	// Add site links
-	$wp_admin_bar->add_group( array(
+	$wp_admin_bar->add_group(array(
 		'parent' => 'my-sites',
 		'id'     => 'my-sites-list',
 		'meta'   => array(
 			'class' => is_super_admin() ? 'ab-sub-secondary' : '',
 		),
-	) );
+	));
 
-	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-		switch_to_blog( $blog->userblog_id );
+	foreach ((array) $wp_admin_bar->user->blogs as $blog) {
+		switch_to_blog($blog->userblog_id);
 
 		$blavatar = '<div class="blavatar"></div>';
 
 		$blogname = $blog->blogname;
 
-		if ( ! $blogname ) {
-			$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+		if ( ! $blogname) {
+			$blogname = preg_replace('#^(https?://)?(www.)?#', '', get_home_url());
 		}
 
-		$menu_id  = 'blog-' . $blog->userblog_id;
+		$menu_id = 'blog-'.$blog->userblog_id;
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent'    => 'my-sites-list',
 			'id'        => $menu_id,
-			'title'     => $blavatar . $blogname,
+			'title'     => $blavatar.$blogname,
 			'href'      => admin_url(),
-		) );
+		));
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => $menu_id,
-			'id'     => $menu_id . '-d',
-			'title'  => __( 'Dashboard' ),
+			'id'     => $menu_id.'-d',
+			'title'  => __('Dashboard'),
 			'href'   => admin_url(),
-		) );
+		));
 
-		if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-			$wp_admin_bar->add_menu( array(
+		if (current_user_can(get_post_type_object('post')->cap->create_posts)) {
+			$wp_admin_bar->add_menu(array(
 				'parent' => $menu_id,
-				'id'     => $menu_id . '-n',
-				'title'  => __( 'New Post' ),
-				'href'   => admin_url( 'post-new.php' ),
-			) );
+				'id'     => $menu_id.'-n',
+				'title'  => __('New Post'),
+				'href'   => admin_url('post-new.php'),
+			));
 		}
 
-		if ( current_user_can( 'edit_posts' ) ) {
-			$wp_admin_bar->add_menu( array(
+		if (current_user_can('edit_posts')) {
+			$wp_admin_bar->add_menu(array(
 				'parent' => $menu_id,
-				'id'     => $menu_id . '-c',
-				'title'  => __( 'Manage Comments' ),
-				'href'   => admin_url( 'edit-comments.php' ),
-			) );
+				'id'     => $menu_id.'-c',
+				'title'  => __('Manage Comments'),
+				'href'   => admin_url('edit-comments.php'),
+			));
 		}
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => $menu_id,
-			'id'     => $menu_id . '-v',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
+			'id'     => $menu_id.'-v',
+			'title'  => __('Visit Site'),
+			'href'   => home_url('/'),
+		));
 
 		restore_current_blog();
 	}
@@ -516,21 +516,21 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
-	$short = wp_get_shortlink( 0, 'query' );
+function wp_admin_bar_shortlink_menu($wp_admin_bar) {
+	$short = wp_get_shortlink(0, 'query');
 	$id = 'get-shortlink';
 
-	if ( empty( $short ) )
+	if (empty($short))
 		return;
 
-	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
+	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="'.esc_attr($short).'" />';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id' => $id,
-		'title' => __( 'Shortlink' ),
+		'title' => __('Shortlink'),
 		'href' => $short,
-		'meta' => array( 'html' => $html ),
-	) );
+		'meta' => array('html' => $html),
+	));
 }
 
 /**
@@ -543,73 +543,73 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_edit_menu( $wp_admin_bar ) {
+function wp_admin_bar_edit_menu($wp_admin_bar) {
 	global $tag, $wp_the_query;
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		$current_screen = get_current_screen();
 		$post = get_post();
 
-		if ( 'post' == $current_screen->base
+		if ('post' == $current_screen->base
 			&& 'add' != $current_screen->action
-			&& ( $post_type_object = get_post_type_object( $post->post_type ) )
-			&& current_user_can( 'read_post', $post->ID )
-			&& ( $post_type_object->public )
-			&& ( $post_type_object->show_in_admin_bar ) )
+			&& ($post_type_object = get_post_type_object($post->post_type))
+			&& current_user_can('read_post', $post->ID)
+			&& ($post_type_object->public)
+			&& ($post_type_object->show_in_admin_bar))
 		{
-			if ( 'draft' == $post->post_status ) {
-				$preview_link = get_preview_post_link( $post );
-				$wp_admin_bar->add_menu( array(
+			if ('draft' == $post->post_status) {
+				$preview_link = get_preview_post_link($post);
+				$wp_admin_bar->add_menu(array(
 					'id' => 'preview',
 					'title' => $post_type_object->labels->view_item,
-					'href' => esc_url( $preview_link ),
-					'meta' => array( 'target' => 'wp-preview-' . $post->ID ),
-				) );
+					'href' => esc_url($preview_link),
+					'meta' => array('target' => 'wp-preview-'.$post->ID),
+				));
 			} else {
-				$wp_admin_bar->add_menu( array(
+				$wp_admin_bar->add_menu(array(
 					'id' => 'view',
 					'title' => $post_type_object->labels->view_item,
-					'href' => get_permalink( $post->ID )
-				) );
+					'href' => get_permalink($post->ID)
+				));
 			}
-		} elseif ( 'term' == $current_screen->base
-			&& isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
-			&& ( $tax = get_taxonomy( $tag->taxonomy ) )
-			&& $tax->public )
+		} elseif ('term' == $current_screen->base
+			&& isset($tag) && is_object($tag) && ! is_wp_error($tag)
+			&& ($tax = get_taxonomy($tag->taxonomy))
+			&& $tax->public)
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'view',
 				'title' => $tax->labels->view_item,
-				'href' => get_term_link( $tag )
-			) );
+				'href' => get_term_link($tag)
+			));
 		}
 	} else {
 		$current_object = $wp_the_query->get_queried_object();
 
-		if ( empty( $current_object ) )
+		if (empty($current_object))
 			return;
 
-		if ( ! empty( $current_object->post_type )
-			&& ( $post_type_object = get_post_type_object( $current_object->post_type ) )
-			&& current_user_can( 'edit_post', $current_object->ID )
+		if ( ! empty($current_object->post_type)
+			&& ($post_type_object = get_post_type_object($current_object->post_type))
+			&& current_user_can('edit_post', $current_object->ID)
 			&& $post_type_object->show_in_admin_bar
-			&& $edit_post_link = get_edit_post_link( $current_object->ID ) )
+			&& $edit_post_link = get_edit_post_link($current_object->ID))
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit',
 				'title' => $post_type_object->labels->edit_item,
 				'href' => $edit_post_link
-			) );
-		} elseif ( ! empty( $current_object->taxonomy )
-			&& ( $tax = get_taxonomy( $current_object->taxonomy ) )
-			&& current_user_can( $tax->cap->edit_terms )
-			&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
+			));
+		} elseif ( ! empty($current_object->taxonomy)
+			&& ($tax = get_taxonomy($current_object->taxonomy))
+			&& current_user_can($tax->cap->edit_terms)
+			&& $edit_term_link = get_edit_term_link($current_object->term_id, $current_object->taxonomy))
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit',
 				'title' => $tax->labels->edit_item,
 				'href' => $edit_term_link
-			) );
+			));
 		}
 	}
 }
@@ -621,60 +621,60 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
+function wp_admin_bar_new_content_menu($wp_admin_bar) {
 	$actions = array();
 
-	$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
+	$cpts = (array) get_post_types(array('show_in_admin_bar' => true), 'objects');
 
-	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
-		$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+	if (isset($cpts['post']) && current_user_can($cpts['post']->cap->create_posts))
+		$actions['post-new.php'] = array($cpts['post']->labels->name_admin_bar, 'new-post');
 
-	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
-		$actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+	if (isset($cpts['attachment']) && current_user_can('upload_files'))
+		$actions['media-new.php'] = array($cpts['attachment']->labels->name_admin_bar, 'new-media');
 
-	if ( current_user_can( 'manage_links' ) )
-		$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+	if (current_user_can('manage_links'))
+		$actions['link-add.php'] = array(_x('Link', 'add new from admin bar'), 'new-link');
 
-	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
-		$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+	if (isset($cpts['page']) && current_user_can($cpts['page']->cap->create_posts))
+		$actions['post-new.php?post_type=page'] = array($cpts['page']->labels->name_admin_bar, 'new-page');
 
-	unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
+	unset($cpts['post'], $cpts['page'], $cpts['attachment']);
 
 	// Add any additional custom post types.
-	foreach ( $cpts as $cpt ) {
-		if ( ! current_user_can( $cpt->cap->create_posts ) )
+	foreach ($cpts as $cpt) {
+		if ( ! current_user_can($cpt->cap->create_posts))
 			continue;
 
-		$key = 'post-new.php?post_type=' . $cpt->name;
-		$actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
+		$key = 'post-new.php?post_type='.$cpt->name;
+		$actions[$key] = array($cpt->labels->name_admin_bar, 'new-'.$cpt->name);
 	}
 	// Avoid clash with parent node and a 'content' post type.
-	if ( isset( $actions['post-new.php?post_type=content'] ) )
+	if (isset($actions['post-new.php?post_type=content']))
 		$actions['post-new.php?post_type=content'][1] = 'add-new-content';
 
-	if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
-		$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
+	if (current_user_can('create_users') || current_user_can('promote_users'))
+		$actions['user-new.php'] = array(_x('User', 'add new from admin bar'), 'new-user');
 
-	if ( ! $actions )
+	if ( ! $actions)
 		return;
 
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
+	$title = '<span class="ab-icon"></span><span class="ab-label">'._x('New', 'admin bar menu group label').'</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'new-content',
 		'title' => $title,
-		'href'  => admin_url( current( array_keys( $actions ) ) ),
-	) );
+		'href'  => admin_url(current(array_keys($actions))),
+	));
 
-	foreach ( $actions as $link => $action ) {
-		list( $title, $id ) = $action;
+	foreach ($actions as $link => $action) {
+		list($title, $id) = $action;
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent'    => 'new-content',
 			'id'        => $id,
 			'title'     => $title,
-			'href'      => admin_url( $link )
-		) );
+			'href'      => admin_url($link)
+		));
 	}
 }
 
@@ -685,23 +685,23 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_comments_menu( $wp_admin_bar ) {
-	if ( !current_user_can('edit_posts') )
+function wp_admin_bar_comments_menu($wp_admin_bar) {
+	if ( ! current_user_can('edit_posts'))
 		return;
 
 	$awaiting_mod = wp_count_comments();
 	$awaiting_mod = $awaiting_mod->moderated;
-	$awaiting_text = sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) );
+	$awaiting_text = sprintf(_n('%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod), number_format_i18n($awaiting_mod));
 
 	$icon  = '<span class="ab-icon"></span>';
-	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '" aria-hidden="true">' . number_format_i18n( $awaiting_mod ) . '</span>';
-	$title .= '<span class="screen-reader-text">' . $awaiting_text . '</span>';
+	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-'.$awaiting_mod.'" aria-hidden="true">'.number_format_i18n($awaiting_mod).'</span>';
+	$title .= '<span class="screen-reader-text">'.$awaiting_text.'</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'comments',
-		'title' => $icon . $title,
+		'title' => $icon.$title,
 		'href'  => admin_url('edit-comments.php'),
-	) );
+	));
 }
 
 /**
@@ -711,56 +711,56 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
+function wp_admin_bar_appearance_menu($wp_admin_bar) {
+	$wp_admin_bar->add_group(array('parent' => 'site-name', 'id' => 'appearance'));
 
-	if ( current_user_can( 'switch_themes' ) ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_user_can('switch_themes')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'themes',
-			'title'  => __( 'Themes' ),
-			'href'   => admin_url( 'themes.php' ),
-		) );
+			'title'  => __('Themes'),
+			'href'   => admin_url('themes.php'),
+		));
 	}
 
-	if ( ! current_user_can( 'edit_theme_options' ) ) {
+	if ( ! current_user_can('edit_theme_options')) {
 		return;
 	}
 
-	if ( current_theme_supports( 'widgets' )  ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_theme_supports('widgets')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'widgets',
-			'title'  => __( 'Widgets' ),
-			'href'   => admin_url( 'widgets.php' ),
-		) );
+			'title'  => __('Widgets'),
+			'href'   => admin_url('widgets.php'),
+		));
 	}
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+	if (current_theme_supports('menus') || current_theme_supports('widgets'))
+		$wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php')));
 
-	if ( current_theme_supports( 'custom-background' ) ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_theme_supports('custom-background')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'background',
-			'title'  => __( 'Background' ),
-			'href'   => admin_url( 'themes.php?page=custom-background' ),
+			'title'  => __('Background'),
+			'href'   => admin_url('themes.php?page=custom-background'),
 			'meta'   => array(
 				'class' => 'hide-if-customize',
 			),
-		) );
+		));
 	}
 
-	if ( current_theme_supports( 'custom-header' ) ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_theme_supports('custom-header')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'header',
-			'title'  => __( 'Header' ),
-			'href'   => admin_url( 'themes.php?page=custom-header' ),
+			'title'  => __('Header'),
+			'href'   => admin_url('themes.php?page=custom-header'),
 			'meta'   => array(
 				'class' => 'hide-if-customize',
 			),
-		) );
+		));
 	}
 
 }
@@ -772,24 +772,24 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_updates_menu( $wp_admin_bar ) {
+function wp_admin_bar_updates_menu($wp_admin_bar) {
 
 	$update_data = wp_get_update_data();
 
-	if ( !$update_data['counts']['total'] )
+	if ( ! $update_data['counts']['total'])
 		return;
 
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
-	$title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
+	$title = '<span class="ab-icon"></span><span class="ab-label">'.number_format_i18n($update_data['counts']['total']).'</span>';
+	$title .= '<span class="screen-reader-text">'.$update_data['title'].'</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'updates',
 		'title' => $title,
-		'href'  => network_admin_url( 'update-core.php' ),
+		'href'  => network_admin_url('update-core.php'),
 		'meta'  => array(
 			'title' => $update_data['title'],
 		),
-	) );
+	));
 }
 
 /**
@@ -799,17 +799,17 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_search_menu( $wp_admin_bar ) {
-	if ( is_admin() )
+function wp_admin_bar_search_menu($wp_admin_bar) {
+	if (is_admin())
 		return;
 
-	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
+	$form  = '<form action="'.esc_url(home_url('/')).'" method="get" id="adminbarsearch">';
 	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
-	$form .= '<label for="adminbar-search" class="screen-reader-text">' . __( 'Search' ) . '</label>';
-	$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
+	$form .= '<label for="adminbar-search" class="screen-reader-text">'.__('Search').'</label>';
+	$form .= '<input type="submit" class="adminbar-button" value="'.__('Search').'"/>';
 	$form .= '</form>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent' => 'top-secondary',
 		'id'     => 'search',
 		'title'  => $form,
@@ -817,7 +817,7 @@ 
 			'class'    => 'admin-bar-search',
 			'tabindex' => -1,
 		)
-	) );
+	));
 }
 
 /**
@@ -827,21 +827,21 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array(
+function wp_admin_bar_add_secondary_groups($wp_admin_bar) {
+	$wp_admin_bar->add_group(array(
 		'id'     => 'top-secondary',
 		'meta'   => array(
 			'class' => 'ab-top-secondary',
 		),
-	) );
+	));
 
-	$wp_admin_bar->add_group( array(
+	$wp_admin_bar->add_group(array(
 		'parent' => 'wp-logo',
 		'id'     => 'wp-logo-external',
 		'meta'   => array(
 			'class' => 'ab-sub-secondary',
 		),
-	) );
+	));
 }
 
 /**
@@ -882,7 +882,7 @@ 
  *
  * @param bool $show Whether to allow the admin bar to show.
  */
-function show_admin_bar( $show ) {
+function show_admin_bar($show) {
 	global $show_admin_bar;
 	$show_admin_bar = (bool) $show;
 }
@@ -901,19 +901,19 @@ 
 	global $show_admin_bar, $pagenow;
 
 	// For all these types of requests, we never want an admin bar.
-	if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
+	if (defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST'))
 		return false;
 
-	if ( is_embed() ) {
+	if (is_embed()) {
 		return false;
 	}
 
 	// Integrated into the admin.
-	if ( is_admin() )
+	if (is_admin())
 		return true;
 
-	if ( ! isset( $show_admin_bar ) ) {
-		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
+	if ( ! isset($show_admin_bar)) {
+		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow) {
 			$show_admin_bar = false;
 		} else {
 			$show_admin_bar = _get_admin_bar_pref();
@@ -930,7 +930,7 @@ 
 	 *
 	 * @param bool $show_admin_bar Whether the admin bar should be shown. Default false.
 	 */
-	$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
+	$show_admin_bar = apply_filters('show_admin_bar', $show_admin_bar);
 
 	return $show_admin_bar;
 }
@@ -946,9 +946,9 @@ 
  * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
  * @return bool Whether the admin bar should be showing for this user.
  */
-function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
-	$pref = get_user_option( "show_admin_bar_{$context}", $user );
-	if ( false === $pref )
+function _get_admin_bar_pref($context = 'front', $user = 0) {
+	$pref = get_user_option("show_admin_bar_{$context}", $user);
+	if (false === $pref)
 		return true;
 
 	return 'true' === $pref;

src/wp-includes/template.php

Spacing +63 added lines, -63 removed lines

@@ -20,13 +20,13 @@ 
  * @param array  $templates An optional list of template candidates
  * @return string Full path to template file.
  */
-function get_query_template( $type, $templates = array() ) {
-	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
+function get_query_template($type, $templates = array()) {
+	$type = preg_replace('|[^a-z0-9-]+|', '', $type);
 
-	if ( empty( $templates ) )
+	if (empty($templates))
 		$templates = array("{$type}.php");
 
-	$template = locate_template( $templates );
+	$template = locate_template($templates);
 
 	/**
 	 * Filter the path of the queried template by type.
@@ -42,7 +42,7 @@ 
 	 *
 	 * @param string $template Path to the template. See locate_template().
 	 */
-	return apply_filters( "{$type}_template", $template );
+	return apply_filters("{$type}_template", $template);
 }
 
 /**
@@ -90,17 +90,17 @@ 
  * @return string Full path to archive template file.
  */
 function get_archive_template() {
-	$post_types = array_filter( (array) get_query_var( 'post_type' ) );
+	$post_types = array_filter((array) get_query_var('post_type'));
 
 	$templates = array();
 
-	if ( count( $post_types ) == 1 ) {
-		$post_type = reset( $post_types );
+	if (count($post_types) == 1) {
+		$post_type = reset($post_types);
 		$templates[] = "archive-{$post_type}.php";
 	}
 	$templates[] = 'archive.php';
 
-	return get_query_template( 'archive', $templates );
+	return get_query_template('archive', $templates);
 }
 
 /**
@@ -116,12 +116,12 @@ 
  * @return string Full path to archive template file.
  */
 function get_post_type_archive_template() {
-	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	$post_type = get_query_var('post_type');
+	if (is_array($post_type))
+		$post_type = reset($post_type);
 
-	$obj = get_post_type_object( $post_type );
-	if ( ! $obj->has_archive )
+	$obj = get_post_type_object($post_type);
+	if ( ! $obj->has_archive)
 		return '';
 
 	return get_archive_template();
@@ -144,13 +144,13 @@ 
 
 	$templates = array();
 
-	if ( $author instanceof WP_User ) {
+	if ($author instanceof WP_User) {
 		$templates[] = "author-{$author->user_nicename}.php";
 		$templates[] = "author-{$author->ID}.php";
 	}
 	$templates[] = 'author.php';
 
-	return get_query_template( 'author', $templates );
+	return get_query_template('author', $templates);
 }
 
 /**
@@ -174,13 +174,13 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $category->slug ) ) {
+	if ( ! empty($category->slug)) {
 		$templates[] = "category-{$category->slug}.php";
 		$templates[] = "category-{$category->term_id}.php";
 	}
 	$templates[] = 'category.php';
 
-	return get_query_template( 'category', $templates );
+	return get_query_template('category', $templates);
 }
 
 /**
@@ -204,13 +204,13 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $tag->slug ) ) {
+	if ( ! empty($tag->slug)) {
 		$templates[] = "tag-{$tag->slug}.php";
 		$templates[] = "tag-{$tag->term_id}.php";
 	}
 	$templates[] = 'tag.php';
 
-	return get_query_template( 'tag', $templates );
+	return get_query_template('tag', $templates);
 }
 
 /**
@@ -239,14 +239,14 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $term->slug ) ) {
+	if ( ! empty($term->slug)) {
 		$taxonomy = $term->taxonomy;
 		$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
 		$templates[] = "taxonomy-$taxonomy.php";
 	}
 	$templates[] = 'taxonomy.php';
 
-	return get_query_template( 'taxonomy', $templates );
+	return get_query_template('taxonomy', $templates);
 }
 
 /**
@@ -281,9 +281,9 @@ 
  * @return string Full path to home template file.
  */
 function get_home_template() {
-	$templates = array( 'home.php', 'index.php' );
+	$templates = array('home.php', 'index.php');
 
-	return get_query_template( 'home', $templates );
+	return get_query_template('home', $templates);
 }
 
 /**
@@ -301,7 +301,7 @@ 
 function get_front_page_template() {
 	$templates = array('front-page.php');
 
-	return get_query_template( 'front_page', $templates );
+	return get_query_template('front_page', $templates);
 }
 
 /**
@@ -325,23 +325,23 @@ 
 	$template = get_page_template_slug();
 	$pagename = get_query_var('pagename');
 
-	if ( ! $pagename && $id ) {
+	if ( ! $pagename && $id) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
+		if ($post)
 			$pagename = $post->post_name;
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
+	if ($template && 0 === validate_file($template))
 		$templates[] = $template;
-	if ( $pagename )
+	if ($pagename)
 		$templates[] = "page-$pagename.php";
-	if ( $id )
+	if ($id)
 		$templates[] = "page-$id.php";
 	$templates[] = 'page.php';
 
-	return get_query_template( 'page', $templates );
+	return get_query_template('page', $templates);
 }
 
 /**
@@ -394,14 +394,14 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) ) {
+	if ( ! empty($object->post_type)) {
 		$templates[] = "single-{$object->post_type}-{$object->post_name}.php";
 		$templates[] = "single-{$object->post_type}.php";
 	}
 
 	$templates[] = "single.php";
 
-	return get_query_template( 'single', $templates );
+	return get_query_template('single', $templates);
 }
 
 /**
@@ -423,9 +423,9 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) ) {
-		$post_format = get_post_format( $object );
-		if ( $post_format ) {
+	if ( ! empty($object->post_type)) {
+		$post_format = get_post_format($object);
+		if ($post_format) {
 			$templates[] = "embed-{$object->post_type}-{$post_format}.php";
 		}
 		$templates[] = "embed-{$object->post_type}.php";
@@ -433,7 +433,7 @@ 
 
 	$templates[] = "embed.php";
 
-	return get_query_template( 'embed', $templates );
+	return get_query_template('embed', $templates);
 }
 
 /**
@@ -449,7 +449,7 @@ 
  * @return string Full path to singular template file
  */
 function get_singular_template() {
-	return get_query_template( 'singular' );
+	return get_query_template('singular');
 }
 
 /**
@@ -479,14 +479,14 @@ 
 
 	$templates = array();
 
-	if ( $attachment ) {
-		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
-			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	if ($attachment) {
+		if (false !== strpos($attachment->post_mime_type, '/')) {
+			list($type, $subtype) = explode('/', $attachment->post_mime_type);
 		} else {
-			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+			list($type, $subtype) = array($attachment->post_mime_type, '');
 		}
 
-		if ( ! empty( $subtype ) ) {
+		if ( ! empty($subtype)) {
 			$templates[] = "{$type}-{$subtype}.php";
 			$templates[] = "{$subtype}.php";
 		}
@@ -494,7 +494,7 @@ 
 	}
 	$templates[] = 'attachment.php';
 
-	return get_query_template( 'attachment', $templates );
+	return get_query_template('attachment', $templates);
 }
 
 /**
@@ -510,25 +510,25 @@ 
  * @param bool         $require_once   Whether to require_once or require. Default true. Has no effect if $load is false.
  * @return string The template filename if one is located.
  */
-function locate_template($template_names, $load = false, $require_once = true ) {
+function locate_template($template_names, $load = false, $require_once = true) {
 	$located = '';
-	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
+	foreach ((array) $template_names as $template_name) {
+		if ( ! $template_name)
 			continue;
-		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
-			$located = STYLESHEETPATH . '/' . $template_name;
+		if (file_exists(STYLESHEETPATH.'/'.$template_name)) {
+			$located = STYLESHEETPATH.'/'.$template_name;
 			break;
-		} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
-			$located = TEMPLATEPATH . '/' . $template_name;
+		} elseif (file_exists(TEMPLATEPATH.'/'.$template_name)) {
+			$located = TEMPLATEPATH.'/'.$template_name;
 			break;
-		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
-			$located = ABSPATH . WPINC . '/theme-compat/' . $template_name;
+		} elseif (file_exists(ABSPATH.WPINC.'/theme-compat/'.$template_name)) {
+			$located = ABSPATH.WPINC.'/theme-compat/'.$template_name;
 			break;
 		}
 	}
 
-	if ( $load && '' != $located )
-		load_template( $located, $require_once );
+	if ($load && '' != $located)
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -557,21 +557,21 @@ 
  * @param string $_template_file Path to template file.
  * @param bool   $require_once   Whether to require_once or require. Default true.
  */
-function load_template( $_template_file, $require_once = true ) {
+function load_template($_template_file, $require_once = true) {
 	global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
-	if ( is_array( $wp_query->query_vars ) ) {
-		extract( $wp_query->query_vars, EXTR_SKIP );
+	if (is_array($wp_query->query_vars)) {
+		extract($wp_query->query_vars, EXTR_SKIP);
 	}
 
-	if ( isset( $s ) ) {
-		$s = esc_attr( $s );
+	if (isset($s)) {
+		$s = esc_attr($s);
 	}
 
-	if ( $require_once ) {
-		require_once( $_template_file );
+	if ($require_once) {
+		require_once($_template_file);
 	} else {
-		require( $_template_file );
+		require($_template_file);
 	}
 }
 

Braces +27 added lines, -18 removed lines

@@ -23,8 +23,9 @@ 
 function get_query_template( $type, $templates = array() ) {
 	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
 
-	if ( empty( $templates ) )
-		$templates = array("{$type}.php");
+	if ( empty( $templates ) ) {
+			$templates = array("{$type}.php");
+	}
 
 	$template = locate_template( $templates );
 
@@ -117,12 +118,14 @@ 
  */
 function get_post_type_archive_template() {
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	if ( is_array( $post_type ) ) {
+			$post_type = reset( $post_type );
+	}
 
 	$obj = get_post_type_object( $post_type );
-	if ( ! $obj->has_archive )
-		return '';
+	if ( ! $obj->has_archive ) {
+			return '';
+	}
 
 	return get_archive_template();
 }
@@ -328,17 +331,21 @@ 
 	if ( ! $pagename && $id ) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
-			$pagename = $post->post_name;
+		if ( $post ) {
+					$pagename = $post->post_name;
+		}
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
-		$templates[] = $template;
-	if ( $pagename )
-		$templates[] = "page-$pagename.php";
-	if ( $id )
-		$templates[] = "page-$id.php";
+	if ( $template && 0 === validate_file( $template ) ) {
+			$templates[] = $template;
+	}
+	if ( $pagename ) {
+			$templates[] = "page-$pagename.php";
+	}
+	if ( $id ) {
+			$templates[] = "page-$id.php";
+	}
 	$templates[] = 'page.php';
 
 	return get_query_template( 'page', $templates );
@@ -513,8 +520,9 @@ 
 function locate_template($template_names, $load = false, $require_once = true ) {
 	$located = '';
 	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
-			continue;
+		if ( !$template_name ) {
+					continue;
+		}
 		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
@@ -527,8 +535,9 @@ 
 		}
 	}
 
-	if ( $load && '' != $located )
-		load_template( $located, $require_once );
+	if ( $load && '' != $located ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }

src/wp-includes/rest-api/class-wp-rest-response.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * REST API: WP_REST_Response class
- *
- * @package WordPress
- * @subpackage REST_API
- * @since 4.4.0
- */
+	 * REST API: WP_REST_Response class
+	 *
+	 * @package WordPress
+	 * @subpackage REST_API
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement a REST response object.

Spacing +37 added lines, -37 removed lines

@@ -59,17 +59,17 @@ 
 	 * @param string $href       Target URI for the link.
 	 * @param array  $attributes Optional. Link parameters to send along with the URL. Default empty array.
 	 */
-	public function add_link( $rel, $href, $attributes = array() ) {
-		if ( empty( $this->links[ $rel ] ) ) {
-			$this->links[ $rel ] = array();
+	public function add_link($rel, $href, $attributes = array()) {
+		if (empty($this->links[$rel])) {
+			$this->links[$rel] = array();
 		}
 
-		if ( isset( $attributes['href'] ) ) {
+		if (isset($attributes['href'])) {
 			// Remove the href attribute, as it's used for the main URL.
-			unset( $attributes['href'] );
+			unset($attributes['href']);
 		}
 
-		$this->links[ $rel ][] = array(
+		$this->links[$rel][] = array(
 			'href'       => $href,
 			'attributes' => $attributes,
 		);
@@ -85,19 +85,19 @@ 
 	 * @param  string $href Optional. Only remove links for the relation matching the given href.
 	 *                      Default null.
 	 */
-	public function remove_link( $rel, $href = null ) {
-		if ( ! isset( $this->links[ $rel ] ) ) {
+	public function remove_link($rel, $href = null) {
+		if ( ! isset($this->links[$rel])) {
 			return;
 		}
 
-		if ( $href ) {
-			$this->links[ $rel ] = wp_list_filter( $this->links[ $rel ], array( 'href' => $href ), 'NOT' );
+		if ($href) {
+			$this->links[$rel] = wp_list_filter($this->links[$rel], array('href' => $href), 'NOT');
 		} else {
-			$this->links[ $rel ] = array();
+			$this->links[$rel] = array();
 		}
 
-		if ( ! $this->links[ $rel ] ) {
-			unset( $this->links[ $rel ] );
+		if ( ! $this->links[$rel]) {
+			unset($this->links[$rel]);
 		}
 	}
 
@@ -114,15 +114,15 @@ 
 	 *
 	 * @param array $links Map of link relation to list of links.
 	 */
-	public function add_links( $links ) {
-		foreach ( $links as $rel => $set ) {
+	public function add_links($links) {
+		foreach ($links as $rel => $set) {
 			// If it's a single link, wrap with an array for consistent handling.
-			if ( isset( $set['href'] ) ) {
-				$set = array( $set );
+			if (isset($set['href'])) {
+				$set = array($set);
 			}
 
-			foreach ( $set as $attributes ) {
-				$this->add_link( $rel, $attributes['href'], $attributes );
+			foreach ($set as $attributes) {
+				$this->add_link($rel, $attributes['href'], $attributes);
 			}
 		}
 	}
@@ -155,16 +155,16 @@ 
 	 * @param array  $other Optional. Other parameters to send, as an assocative array.
 	 *                      Default empty array.
 	 */
-	public function link_header( $rel, $link, $other = array() ) {
-		$header = '<' . $link . '>; rel="' . $rel . '"';
+	public function link_header($rel, $link, $other = array()) {
+		$header = '<'.$link.'>; rel="'.$rel.'"';
 
-		foreach ( $other as $key => $value ) {
-			if ( 'title' === $key ) {
-				$value = '"' . $value . '"';
+		foreach ($other as $key => $value) {
+			if ('title' === $key) {
+				$value = '"'.$value.'"';
 			}
-			$header .= '; ' . $key . '=' . $value;
+			$header .= '; '.$key.'='.$value;
 		}
-		$this->header( 'Link', $header, false );
+		$this->header('Link', $header, false);
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 *
 	 * @param string $route Route name.
 	 */
-	public function set_matched_route( $route ) {
+	public function set_matched_route($route) {
 		$this->matched_route = $route;
 	}
 
@@ -211,7 +211,7 @@ 
 	 *
 	 * @param array $handler The matched handler.
 	 */
-	public function set_matched_handler( $handler ) {
+	public function set_matched_handler($handler) {
 		$this->matched_handler = $handler;
 	}
 
@@ -236,22 +236,22 @@ 
 	 * @return WP_Error|null WP_Error or null on not an errored response.
 	 */
 	public function as_error() {
-		if ( ! $this->is_error() ) {
+		if ( ! $this->is_error()) {
 			return null;
 		}
 
 		$error = new WP_Error;
 
-		if ( is_array( $this->get_data() ) ) {
+		if (is_array($this->get_data())) {
 			$data = $this->get_data();
-			$error->add( $data['code'], $data['message'], $data['data'] );
-			if ( ! empty( $data['additional_errors'] ) ) {
-				foreach( $data['additional_errors'] as $err ) {
-					$error->add( $err['code'], $err['message'], $err['data'] );
+			$error->add($data['code'], $data['message'], $data['data']);
+			if ( ! empty($data['additional_errors'])) {
+				foreach ($data['additional_errors'] as $err) {
+					$error->add($err['code'], $err['message'], $err['data']);
 				}
 			}
 		} else {
-			$error->add( $this->get_status(), '', array( 'status' => $this->get_status() ) );
+			$error->add($this->get_status(), '', array('status' => $this->get_status()));
 		}
 
 		return $error;
@@ -299,7 +299,7 @@ 
 		 *
 		 * @param array $additional Additional CURIEs to register with the API.
 		 */
-		$additional = apply_filters( 'rest_response_link_curies', array() );
-		return array_merge( $curies, $additional );
+		$additional = apply_filters('rest_response_link_curies', array());
+		return array_merge($curies, $additional);
 	}
 }

src/wp-includes/customize/class-wp-customize-nav-menus-panel.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Customize API: WP_Customize_Nav_Menus_Panel class
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.4.0
- */
+	 * Customize API: WP_Customize_Nav_Menus_Panel class
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 4.4.0
+	 */
 
 /**
  * Customize Nav Menus Panel Class

Spacing +10 added lines, -10 removed lines

@@ -35,12 +35,12 @@ 
 	 */
 	public function render_screen_options() {
 		// Adds the screen options.
-		require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
-		add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
+		require_once ABSPATH.'wp-admin/includes/nav-menu.php';
+		add_filter('manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
 
 		// Display screen options.
-		$screen = WP_Screen::get( 'nav-menus.php' );
-		$screen->render_screen_options( array( 'wrap' => false ) );
+		$screen = WP_Screen::get('nav-menus.php');
+		$screen->render_screen_options(array('wrap' => false));
 	}
 
 	/**
@@ -52,8 +52,8 @@ 
 	 * @deprecated 4.5.0 Deprecated in favor of wp_nav_menu_manage_columns().
 	 */
 	public function wp_nav_menu_manage_columns() {
-		_deprecated_function( __METHOD__, '4.5.0', 'wp_nav_menu_manage_columns' );
-		require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+		_deprecated_function(__METHOD__, '4.5.0', 'wp_nav_menu_manage_columns');
+		require_once ABSPATH.'wp-admin/includes/nav-menu.php';
 		return wp_nav_menu_manage_columns();
 	}
 
@@ -72,20 +72,20 @@ 
 		?>
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
 			<button type="button" class="customize-panel-back" tabindex="-1">
-				<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Back'); ?></span>
 			</button>
 			<div class="accordion-section-title">
 				<span class="preview-notice">
 					<?php
 					/* translators: %s: the site/panel title in the Customizer */
-					printf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
+					printf(__('You are customizing %s'), '<strong class="panel-title">{{ data.title }}</strong>');
 					?>
 				</span>
 				<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false">
-					<span class="screen-reader-text"><?php _e( 'Help' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Help'); ?></span>
 				</button>
 				<button type="button" class="customize-screen-options-toggle" aria-expanded="false">
-					<span class="screen-reader-text"><?php _e( 'Menu Options' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Menu Options'); ?></span>
 				</button>
 			</div>
 			<# if ( data.description ) { #>

src/wp-includes/customize/class-wp-customize-site-icon-control.php

Spacing +7 added lines, -7 removed lines

@@ -37,9 +37,9 @@ 
 	 * @param string               $id      Control ID.
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		parent::__construct( $manager, $id, $args );
-		add_action( 'customize_controls_print_styles', 'wp_site_icon', 99 );
+	public function __construct($manager, $id, $args = array()) {
+		parent::__construct($manager, $id, $args);
+		add_action('customize_controls_print_styles', 'wp_site_icon', 99);
 	}
 
 	/**
@@ -64,14 +64,14 @@ 
 			<div class="container">
 				<div class="site-icon-preview">
 					<div class="favicon-preview">
-						<img src="<?php echo esc_url( admin_url( 'images/browser.png' ) ); ?>" class="browser-preview" width="182" alt="<?php esc_attr_e( 'Browser interface preview' ); ?>" />
+						<img src="<?php echo esc_url(admin_url('images/browser.png')); ?>" class="browser-preview" width="182" alt="<?php esc_attr_e('Browser interface preview'); ?>" />
 
 						<div class="favicon">
-							<img id="preview-favicon" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
+							<img id="preview-favicon" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e('Preview as a browser icon'); ?>"/>
 						</div>
-						<span class="browser-title"><?php bloginfo( 'name' ); ?></span>
+						<span class="browser-title"><?php bloginfo('name'); ?></span>
 					</div>
-					<img class="app-icon-preview" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
+					<img class="app-icon-preview" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e('Preview as an app icon'); ?>"/>
 				</div>
 			</div>
 		</div>