ntwb / wordpress

src/wp-includes/nav-menu.php

Indentation +14 added lines, -14 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Navigation Menu functions
- *
- * @package WordPress
- * @subpackage Nav_Menus
- * @since 3.0.0
- */
+	 * Navigation Menu functions
+	 *
+	 * @package WordPress
+	 * @subpackage Nav_Menus
+	 * @since 3.0.0
+	 */
 
 /**
  * Returns a navigation menu object.
@@ -126,14 +126,14 @@ 
 	register_nav_menus( array( $location => $description ) );
 }
 /**
- * Returns an array of all registered navigation menus in a theme
- *
- * @since 3.0.0
- *
- * @global array $_wp_registered_nav_menus
- *
- * @return array
- */
+	 * Returns an array of all registered navigation menus in a theme
+	 *
+	 * @since 3.0.0
+	 *
+	 * @global array $_wp_registered_nav_menus
+	 *
+	 * @return array
+	 */
 function get_registered_nav_menus() {
 	global $_wp_registered_nav_menus;
 	if ( isset( $_wp_registered_nav_menus ) )

Spacing +224 added lines, -224 removed lines

@@ -15,26 +15,26 @@ 
  * @param string $menu Menu ID, slug, or name - or the menu object.
  * @return object|false False if $menu param isn't supplied or term does not exist, menu object if successful.
  */
-function wp_get_nav_menu_object( $menu ) {
+function wp_get_nav_menu_object($menu) {
 	$menu_obj = false;
 
-	if ( is_object( $menu ) ) {
+	if (is_object($menu)) {
 		$menu_obj = $menu;
 	}
 
-	if ( $menu && ! $menu_obj ) {
-		$menu_obj = get_term( $menu, 'nav_menu' );
+	if ($menu && ! $menu_obj) {
+		$menu_obj = get_term($menu, 'nav_menu');
 
-		if ( ! $menu_obj ) {
-			$menu_obj = get_term_by( 'slug', $menu, 'nav_menu' );
+		if ( ! $menu_obj) {
+			$menu_obj = get_term_by('slug', $menu, 'nav_menu');
 		}
 
-		if ( ! $menu_obj ) {
-			$menu_obj = get_term_by( 'name', $menu, 'nav_menu' );
+		if ( ! $menu_obj) {
+			$menu_obj = get_term_by('name', $menu, 'nav_menu');
 		}
 	}
 
-	if ( ! $menu_obj || is_wp_error( $menu_obj ) ) {
+	if ( ! $menu_obj || is_wp_error($menu_obj)) {
 		$menu_obj = false;
 	}
 
@@ -46,7 +46,7 @@ 
 	 * @param object|false $menu_obj Term from nav_menu taxonomy, or false if nothing had been found.
 	 * @param string       $menu     The menu ID, slug, or name passed to wp_get_nav_menu_object().
 	 */
-	return apply_filters( 'wp_get_nav_menu_object', $menu_obj, $menu );
+	return apply_filters('wp_get_nav_menu_object', $menu_obj, $menu);
 }
 
 /**
@@ -59,16 +59,16 @@ 
  * @param int|string $menu The menu to check (ID, slug, or name).
  * @return bool Whether the menu exists.
  */
-function is_nav_menu( $menu ) {
-	if ( ! $menu )
+function is_nav_menu($menu) {
+	if ( ! $menu)
 		return false;
 
-	$menu_obj = wp_get_nav_menu_object( $menu );
+	$menu_obj = wp_get_nav_menu_object($menu);
 
 	if (
 		$menu_obj &&
-		! is_wp_error( $menu_obj ) &&
-		! empty( $menu_obj->taxonomy ) &&
+		! is_wp_error($menu_obj) &&
+		! empty($menu_obj->taxonomy) &&
 		'nav_menu' == $menu_obj->taxonomy
 	)
 		return true;
@@ -85,12 +85,12 @@ 
  *
  * @param array $locations Associative array of menu location identifiers (like a slug) and descriptive text.
  */
-function register_nav_menus( $locations = array() ) {
+function register_nav_menus($locations = array()) {
 	global $_wp_registered_nav_menus;
 
-	add_theme_support( 'menus' );
+	add_theme_support('menus');
 
-	$_wp_registered_nav_menus = array_merge( (array) $_wp_registered_nav_menus, $locations );
+	$_wp_registered_nav_menus = array_merge((array) $_wp_registered_nav_menus, $locations);
 }
 
 /**
@@ -101,13 +101,13 @@ 
  * @param string $location The menu location identifier.
  * @return bool True on success, false on failure.
  */
-function unregister_nav_menu( $location ) {
+function unregister_nav_menu($location) {
 	global $_wp_registered_nav_menus;
 
-	if ( is_array( $_wp_registered_nav_menus ) && isset( $_wp_registered_nav_menus[$location] ) ) {
-		unset( $_wp_registered_nav_menus[$location] );
-		if ( empty( $_wp_registered_nav_menus ) ) {
-			_remove_theme_support( 'menus' );
+	if (is_array($_wp_registered_nav_menus) && isset($_wp_registered_nav_menus[$location])) {
+		unset($_wp_registered_nav_menus[$location]);
+		if (empty($_wp_registered_nav_menus)) {
+			_remove_theme_support('menus');
 		}
 		return true;
 	}
@@ -122,8 +122,8 @@ 
  * @param string $location    Menu location identifier, like a slug.
  * @param string $description Menu location descriptive text.
  */
-function register_nav_menu( $location, $description ) {
-	register_nav_menus( array( $location => $description ) );
+function register_nav_menu($location, $description) {
+	register_nav_menus(array($location => $description));
 }
 /**
  * Returns an array of all registered navigation menus in a theme
@@ -136,7 +136,7 @@ 
  */
 function get_registered_nav_menus() {
 	global $_wp_registered_nav_menus;
-	if ( isset( $_wp_registered_nav_menus ) )
+	if (isset($_wp_registered_nav_menus))
 		return $_wp_registered_nav_menus;
 	return array();
 }
@@ -149,8 +149,8 @@ 
  */
 
 function get_nav_menu_locations() {
-	$locations = get_theme_mod( 'nav_menu_locations' );
-	return ( is_array( $locations ) ) ? $locations : array();
+	$locations = get_theme_mod('nav_menu_locations');
+	return (is_array($locations)) ? $locations : array();
 }
 
 /**
@@ -161,13 +161,13 @@ 
  * @param string $location Menu location identifier.
  * @return bool Whether location has a menu.
  */
-function has_nav_menu( $location ) {
+function has_nav_menu($location) {
 	$has_nav_menu = false;
 
 	$registered_nav_menus = get_registered_nav_menus();
-	if ( isset( $registered_nav_menus[ $location ] ) ) {
+	if (isset($registered_nav_menus[$location])) {
 		$locations = get_nav_menu_locations();
-		$has_nav_menu = ! empty( $locations[ $location ] );
+		$has_nav_menu = ! empty($locations[$location]);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 * @param bool   $has_nav_menu Whether there is a menu assigned to a location.
 	 * @param string $location     Menu location.
 	 */
-	return apply_filters( 'has_nav_menu', $has_nav_menu, $location );
+	return apply_filters('has_nav_menu', $has_nav_menu, $location);
 }
 
 /**
@@ -189,8 +189,8 @@ 
  * @param int $menu_item_id The ID of the potential nav menu item.
  * @return bool Whether the given ID is that of a nav menu item.
  */
-function is_nav_menu_item( $menu_item_id = 0 ) {
-	return ( ! is_wp_error( $menu_item_id ) && ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) );
+function is_nav_menu_item($menu_item_id = 0) {
+	return ( ! is_wp_error($menu_item_id) && ('nav_menu_item' == get_post_type($menu_item_id)));
 }
 
 /**
@@ -201,8 +201,8 @@ 
  * @param string $menu_name Menu name.
  * @return int|WP_Error Menu ID on success, WP_Error object on failure.
  */
-function wp_create_nav_menu( $menu_name ) {
-	return wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) );
+function wp_create_nav_menu($menu_name) {
+	return wp_update_nav_menu_object(0, array('menu-name' => $menu_name));
 }
 
 /**
@@ -213,29 +213,29 @@ 
  * @param string $menu Menu ID, slug, or name.
  * @return bool|WP_Error True on success, false or WP_Error object on failure.
  */
-function wp_delete_nav_menu( $menu ) {
-	$menu = wp_get_nav_menu_object( $menu );
-	if ( ! $menu )
+function wp_delete_nav_menu($menu) {
+	$menu = wp_get_nav_menu_object($menu);
+	if ( ! $menu)
 		return false;
 
-	$menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' );
-	if ( ! empty( $menu_objects ) ) {
-		foreach ( $menu_objects as $item ) {
-			wp_delete_post( $item );
+	$menu_objects = get_objects_in_term($menu->term_id, 'nav_menu');
+	if ( ! empty($menu_objects)) {
+		foreach ($menu_objects as $item) {
+			wp_delete_post($item);
 		}
 	}
 
-	$result = wp_delete_term( $menu->term_id, 'nav_menu' );
+	$result = wp_delete_term($menu->term_id, 'nav_menu');
 
 	// Remove this menu from any locations.
 	$locations = get_nav_menu_locations();
-	foreach ( $locations as $location => $menu_id ) {
-		if ( $menu_id == $menu->term_id )
-			$locations[ $location ] = 0;
+	foreach ($locations as $location => $menu_id) {
+		if ($menu_id == $menu->term_id)
+			$locations[$location] = 0;
 	}
-	set_theme_mod( 'nav_menu_locations', $locations );
+	set_theme_mod('nav_menu_locations', $locations);
 
-	if ( $result && !is_wp_error($result) )
+	if ($result && ! is_wp_error($result))
 
 		/**
 		 * Fires after a navigation menu has been successfully deleted.
@@ -244,7 +244,7 @@ 
 		 *
 		 * @param int $term_id ID of the deleted menu.
 		 */
-		do_action( 'wp_delete_nav_menu', $menu->term_id );
+		do_action('wp_delete_nav_menu', $menu->term_id);
 
 	return $result;
 }
@@ -258,38 +258,38 @@ 
  * @param array $menu_data The array of menu data.
  * @return int|WP_Error Menu ID on success, WP_Error object on failure.
  */
-function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
+function wp_update_nav_menu_object($menu_id = 0, $menu_data = array()) {
 	$menu_id = (int) $menu_id;
 
-	$_menu = wp_get_nav_menu_object( $menu_id );
+	$_menu = wp_get_nav_menu_object($menu_id);
 
 	$args = array(
-		'description' => ( isset( $menu_data['description'] ) ? $menu_data['description']  : '' ),
-		'name'        => ( isset( $menu_data['menu-name']   ) ? $menu_data['menu-name']    : '' ),
-		'parent'      => ( isset( $menu_data['parent']      ) ? (int) $menu_data['parent'] : 0  ),
+		'description' => (isset($menu_data['description']) ? $menu_data['description'] : ''),
+		'name'        => (isset($menu_data['menu-name']) ? $menu_data['menu-name'] : ''),
+		'parent'      => (isset($menu_data['parent']) ? (int) $menu_data['parent'] : 0),
 		'slug'        => null,
 	);
 
 	// double-check that we're not going to have one menu take the name of another
-	$_possible_existing = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
+	$_possible_existing = get_term_by('name', $menu_data['menu-name'], 'nav_menu');
 	if (
 		$_possible_existing &&
-		! is_wp_error( $_possible_existing ) &&
-		isset( $_possible_existing->term_id ) &&
+		! is_wp_error($_possible_existing) &&
+		isset($_possible_existing->term_id) &&
 		$_possible_existing->term_id != $menu_id
 	)
-		return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+		return new WP_Error('menu_exists', sprintf(__('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html($menu_data['menu-name'])));
 
 	// menu doesn't already exist, so create a new menu
-	if ( ! $_menu || is_wp_error( $_menu ) ) {
-		$menu_exists = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
+	if ( ! $_menu || is_wp_error($_menu)) {
+		$menu_exists = get_term_by('name', $menu_data['menu-name'], 'nav_menu');
 
-		if ( $menu_exists )
-			return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+		if ($menu_exists)
+			return new WP_Error('menu_exists', sprintf(__('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html($menu_data['menu-name'])));
 
-		$_menu = wp_insert_term( $menu_data['menu-name'], 'nav_menu', $args );
+		$_menu = wp_insert_term($menu_data['menu-name'], 'nav_menu', $args);
 
-		if ( is_wp_error( $_menu ) )
+		if (is_wp_error($_menu))
 			return $_menu;
 
 		/**
@@ -300,19 +300,19 @@ 
 		 * @param int   $term_id   ID of the new menu.
 		 * @param array $menu_data An array of menu data.
 		 */
-		do_action( 'wp_create_nav_menu', $_menu['term_id'], $menu_data );
+		do_action('wp_create_nav_menu', $_menu['term_id'], $menu_data);
 
 		return (int) $_menu['term_id'];
 	}
 
-	if ( ! $_menu || ! isset( $_menu->term_id ) )
+	if ( ! $_menu || ! isset($_menu->term_id))
 		return 0;
 
 	$menu_id = (int) $_menu->term_id;
 
-	$update_response = wp_update_term( $menu_id, 'nav_menu', $args );
+	$update_response = wp_update_term($menu_id, 'nav_menu', $args);
 
-	if ( is_wp_error( $update_response ) )
+	if (is_wp_error($update_response))
 		return $update_response;
 
 	$menu_id = (int) $update_response['term_id'];
@@ -325,7 +325,7 @@ 
 	 * @param int   $menu_id   ID of the updated menu.
 	 * @param array $menu_data An array of menu data.
 	 */
-	do_action( 'wp_update_nav_menu', $menu_id, $menu_data );
+	do_action('wp_update_nav_menu', $menu_id, $menu_data);
 	return $menu_id;
 }
 
@@ -339,21 +339,21 @@ 
  * @param array $menu_item_data  The menu item's data.
  * @return int|WP_Error The menu item's database ID or WP_Error object on failure.
  */
-function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item_data = array() ) {
+function wp_update_nav_menu_item($menu_id = 0, $menu_item_db_id = 0, $menu_item_data = array()) {
 	$menu_id = (int) $menu_id;
 	$menu_item_db_id = (int) $menu_item_db_id;
 
 	// make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects
-	if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) )
-		return new WP_Error( 'update_nav_menu_item_failed', __( 'The given object ID is not that of a menu item.' ) );
+	if ( ! empty($menu_item_db_id) && ! is_nav_menu_item($menu_item_db_id))
+		return new WP_Error('update_nav_menu_item_failed', __('The given object ID is not that of a menu item.'));
 
-	$menu = wp_get_nav_menu_object( $menu_id );
+	$menu = wp_get_nav_menu_object($menu_id);
 
-	if ( ! $menu && 0 !== $menu_id ) {
-		return new WP_Error( 'invalid_menu_id', __( 'Invalid menu ID.' ) );
+	if ( ! $menu && 0 !== $menu_id) {
+		return new WP_Error('invalid_menu_id', __('Invalid menu ID.'));
 	}
 
-	if ( is_wp_error( $menu ) ) {
+	if (is_wp_error($menu)) {
 		return $menu;
 	}
 
@@ -374,19 +374,19 @@ 
 		'menu-item-status' => '',
 	);
 
-	$args = wp_parse_args( $menu_item_data, $defaults );
+	$args = wp_parse_args($menu_item_data, $defaults);
 
-	if ( 0 == $menu_id ) {
+	if (0 == $menu_id) {
 		$args['menu-item-position'] = 1;
-	} elseif ( 0 == (int) $args['menu-item-position'] ) {
-		$menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-		$last_item = array_pop( $menu_items );
-		$args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : count( $menu_items );
+	} elseif (0 == (int) $args['menu-item-position']) {
+		$menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items($menu_id, array('post_status' => 'publish,draft'));
+		$last_item = array_pop($menu_items);
+		$args['menu-item-position'] = ($last_item && isset($last_item->menu_order)) ? 1 + $last_item->menu_order : count($menu_items);
 	}
 
-	$original_parent = 0 < $menu_item_db_id ? get_post_field( 'post_parent', $menu_item_db_id ) : 0;
+	$original_parent = 0 < $menu_item_db_id ? get_post_field('post_parent', $menu_item_db_id) : 0;
 
-	if ( 'custom' != $args['menu-item-type'] ) {
+	if ('custom' != $args['menu-item-type']) {
 		/* if non-custom menu item, then:
 			* use original object's URL
 			* blank default title to sync with original object's
@@ -395,21 +395,21 @@ 
 		$args['menu-item-url'] = '';
 
 		$original_title = '';
-		if ( 'taxonomy' == $args['menu-item-type'] ) {
-			$original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
-			$original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
-		} elseif ( 'post_type' == $args['menu-item-type'] ) {
+		if ('taxonomy' == $args['menu-item-type']) {
+			$original_parent = get_term_field('parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw');
+			$original_title = get_term_field('name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw');
+		} elseif ('post_type' == $args['menu-item-type']) {
 
-			$original_object = get_post( $args['menu-item-object-id'] );
+			$original_object = get_post($args['menu-item-object-id']);
 			$original_parent = (int) $original_object->post_parent;
 			$original_title = $original_object->post_title;
 		}
 
-		if ( $args['menu-item-title'] == $original_title )
+		if ($args['menu-item-title'] == $original_title)
 			$args['menu-item-title'] = '';
 
 		// hack to get wp to create a post object when too many properties are empty
-		if ( '' ==  $args['menu-item-title'] && '' == $args['menu-item-description'] )
+		if ('' == $args['menu-item-title'] && '' == $args['menu-item-description'])
 			$args['menu-item-description'] = ' ';
 	}
 
@@ -427,49 +427,49 @@ 
 	$update = 0 != $menu_item_db_id;
 
 	// New menu item. Default is draft status
-	if ( ! $update ) {
+	if ( ! $update) {
 		$post['ID'] = 0;
 		$post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
-		$menu_item_db_id = wp_insert_post( $post );
-		if ( ! $menu_item_db_id	|| is_wp_error( $menu_item_db_id ) )
+		$menu_item_db_id = wp_insert_post($post);
+		if ( ! $menu_item_db_id || is_wp_error($menu_item_db_id))
 			return $menu_item_db_id;
 	}
 
 	// Associate the menu item with the menu term
 	// Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
-	 if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
-		wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
+	 if ($menu_id && ( ! $update || ! is_object_in_term($menu_item_db_id, 'nav_menu', (int) $menu->term_id))) {
+		wp_set_object_terms($menu_item_db_id, array($menu->term_id), 'nav_menu');
 	}
 
-	if ( 'custom' == $args['menu-item-type'] ) {
+	if ('custom' == $args['menu-item-type']) {
 		$args['menu-item-object-id'] = $menu_item_db_id;
 		$args['menu-item-object'] = 'custom';
 	}
 
 	$menu_item_db_id = (int) $menu_item_db_id;
 
-	update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key($args['menu-item-type']) );
-	update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', strval( (int) $args['menu-item-parent-id'] ) );
-	update_post_meta( $menu_item_db_id, '_menu_item_object_id', strval( (int) $args['menu-item-object-id'] ) );
-	update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
-	update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
+	update_post_meta($menu_item_db_id, '_menu_item_type', sanitize_key($args['menu-item-type']));
+	update_post_meta($menu_item_db_id, '_menu_item_menu_item_parent', strval((int) $args['menu-item-parent-id']));
+	update_post_meta($menu_item_db_id, '_menu_item_object_id', strval((int) $args['menu-item-object-id']));
+	update_post_meta($menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']));
+	update_post_meta($menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']));
 
-	$args['menu-item-classes'] = array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-classes'] ) );
-	$args['menu-item-xfn'] = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
-	update_post_meta( $menu_item_db_id, '_menu_item_classes', $args['menu-item-classes'] );
-	update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
-	update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
+	$args['menu-item-classes'] = array_map('sanitize_html_class', explode(' ', $args['menu-item-classes']));
+	$args['menu-item-xfn'] = implode(' ', array_map('sanitize_html_class', explode(' ', $args['menu-item-xfn'])));
+	update_post_meta($menu_item_db_id, '_menu_item_classes', $args['menu-item-classes']);
+	update_post_meta($menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn']);
+	update_post_meta($menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']));
 
-	if ( 0 == $menu_id )
-		update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
-	elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) )
-		delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
+	if (0 == $menu_id)
+		update_post_meta($menu_item_db_id, '_menu_item_orphaned', (string) time());
+	elseif (get_post_meta($menu_item_db_id, '_menu_item_orphaned'))
+		delete_post_meta($menu_item_db_id, '_menu_item_orphaned');
 
 	// Update existing menu item. Default is publish status
-	if ( $update ) {
+	if ($update) {
 		$post['ID'] = $menu_item_db_id;
 		$post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
-		wp_update_post( $post );
+		wp_update_post($post);
 	}
 
 	/**
@@ -483,7 +483,7 @@ 
 	 * @param int   $menu_item_db_id ID of the updated menu item.
 	 * @param array $args            An array of arguments used to update a menu item.
 	 */
-	do_action( 'wp_update_nav_menu_item', $menu_id, $menu_item_db_id, $args );
+	do_action('wp_update_nav_menu_item', $menu_id, $menu_item_db_id, $args);
 
 	return $menu_item_db_id;
 }
@@ -499,9 +499,9 @@ 
  *                    Default empty array.
  * @return array Menu objects.
  */
-function wp_get_nav_menus( $args = array() ) {
-	$defaults = array( 'hide_empty' => false, 'orderby' => 'name' );
-	$args = wp_parse_args( $args, $defaults );
+function wp_get_nav_menus($args = array()) {
+	$defaults = array('hide_empty' => false, 'orderby' => 'name');
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filter the navigation menu objects being returned.
@@ -513,7 +513,7 @@ 
 	 * @param array $menus An array of menu objects.
 	 * @param array $args  An array of arguments used to retrieve menu objects.
 	 */
-	return apply_filters( 'wp_get_nav_menus', get_terms( 'nav_menu',  $args), $args );
+	return apply_filters('wp_get_nav_menus', get_terms('nav_menu', $args), $args);
 }
 
 /**
@@ -528,24 +528,24 @@ 
  * @param object $b The second object to compare
  * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b.
  */
-function _sort_nav_menu_items( $a, $b ) {
+function _sort_nav_menu_items($a, $b) {
 	global $_menu_item_sort_prop;
 
-	if ( empty( $_menu_item_sort_prop ) )
+	if (empty($_menu_item_sort_prop))
 		return 0;
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
+	if ( ! isset($a->$_menu_item_sort_prop) || ! isset($b->$_menu_item_sort_prop))
 		return 0;
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
+	if ($a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop)
 		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
+	elseif ($_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop)
 		return $_a < $_b ? -1 : 1;
 	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+		return strcmp($a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop);
 }
 
 /**
@@ -559,8 +559,8 @@ 
  * @param object $item The menu item to check.
  * @return bool False if invalid, otherwise true.
  */
-function _is_valid_nav_menu_item( $item ) {
-	return empty( $item->_invalid );
+function _is_valid_nav_menu_item($item) {
+	return empty($item->_invalid);
 }
 
 /**
@@ -575,76 +575,76 @@ 
  * @param array  $args Optional. Arguments to pass to {@see get_posts()}.
  * @return false|array $items Array of menu items, otherwise false.
  */
-function wp_get_nav_menu_items( $menu, $args = array() ) {
-	$menu = wp_get_nav_menu_object( $menu );
+function wp_get_nav_menu_items($menu, $args = array()) {
+	$menu = wp_get_nav_menu_object($menu);
 
-	if ( ! $menu ) {
+	if ( ! $menu) {
 		return false;
 	}
 
 	static $fetched = array();
 
-	$items = get_objects_in_term( $menu->term_id, 'nav_menu' );
-	if ( is_wp_error( $items ) ) {
+	$items = get_objects_in_term($menu->term_id, 'nav_menu');
+	if (is_wp_error($items)) {
 		return false;
 	}
 
-	$defaults = array( 'order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item',
-		'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order', 'nopaging' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item',
+		'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order', 'nopaging' => true);
+	$args = wp_parse_args($args, $defaults);
 	$args['include'] = $items;
 
-	if ( ! empty( $items ) ) {
-		$items = get_posts( $args );
+	if ( ! empty($items)) {
+		$items = get_posts($args);
 	} else {
 		$items = array();
 	}
 
 	// Get all posts and terms at once to prime the caches
-	if ( empty( $fetched[$menu->term_id] ) || wp_using_ext_object_cache() ) {
+	if (empty($fetched[$menu->term_id]) || wp_using_ext_object_cache()) {
 		$fetched[$menu->term_id] = true;
 		$posts = array();
 		$terms = array();
-		foreach ( $items as $item ) {
-			$object_id = get_post_meta( $item->ID, '_menu_item_object_id', true );
-			$object    = get_post_meta( $item->ID, '_menu_item_object',    true );
-			$type      = get_post_meta( $item->ID, '_menu_item_type',      true );
+		foreach ($items as $item) {
+			$object_id = get_post_meta($item->ID, '_menu_item_object_id', true);
+			$object    = get_post_meta($item->ID, '_menu_item_object', true);
+			$type      = get_post_meta($item->ID, '_menu_item_type', true);
 
-			if ( 'post_type' == $type )
+			if ('post_type' == $type)
 				$posts[$object][] = $object_id;
-			elseif ( 'taxonomy' == $type)
+			elseif ('taxonomy' == $type)
 				$terms[$object][] = $object_id;
 		}
 
-		if ( ! empty( $posts ) ) {
-			foreach ( array_keys($posts) as $post_type ) {
-				get_posts( array('post__in' => $posts[$post_type], 'post_type' => $post_type, 'nopaging' => true, 'update_post_term_cache' => false) );
+		if ( ! empty($posts)) {
+			foreach (array_keys($posts) as $post_type) {
+				get_posts(array('post__in' => $posts[$post_type], 'post_type' => $post_type, 'nopaging' => true, 'update_post_term_cache' => false));
 			}
 		}
 		unset($posts);
 
-		if ( ! empty( $terms ) ) {
-			foreach ( array_keys($terms) as $taxonomy ) {
-				get_terms( $taxonomy, array(
-					'include' => $terms[ $taxonomy ],
+		if ( ! empty($terms)) {
+			foreach (array_keys($terms) as $taxonomy) {
+				get_terms($taxonomy, array(
+					'include' => $terms[$taxonomy],
 					'hierarchical' => false,
-				) );
+				));
 			}
 		}
 		unset($terms);
 	}
 
-	$items = array_map( 'wp_setup_nav_menu_item', $items );
+	$items = array_map('wp_setup_nav_menu_item', $items);
 
-	if ( ! is_admin() ) { // Remove invalid items only in frontend
-		$items = array_filter( $items, '_is_valid_nav_menu_item' );
+	if ( ! is_admin()) { // Remove invalid items only in frontend
+		$items = array_filter($items, '_is_valid_nav_menu_item');
 	}
 
-	if ( ARRAY_A == $args['output'] ) {
+	if (ARRAY_A == $args['output']) {
 		$GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
 		usort($items, '_sort_nav_menu_items');
 		$i = 1;
-		foreach( $items as $k => $item ) {
+		foreach ($items as $k => $item) {
 			$items[$k]->{$args['output_key']} = $i++;
 		}
 	}
@@ -658,7 +658,7 @@ 
 	 * @param object $menu  The menu object.
 	 * @param array  $args  An array of arguments used to retrieve menu item objects.
 	 */
-	return apply_filters( 'wp_get_nav_menu_items', $items, $menu, $args );
+	return apply_filters('wp_get_nav_menu_items', $items, $menu, $args);
 }
 
 /**
@@ -688,60 +688,60 @@ 
  * @param object $menu_item The menu item to modify.
  * @return object $menu_item The menu item with standard menu item properties.
  */
-function wp_setup_nav_menu_item( $menu_item ) {
-	if ( isset( $menu_item->post_type ) ) {
-		if ( 'nav_menu_item' == $menu_item->post_type ) {
+function wp_setup_nav_menu_item($menu_item) {
+	if (isset($menu_item->post_type)) {
+		if ('nav_menu_item' == $menu_item->post_type) {
 			$menu_item->db_id = (int) $menu_item->ID;
-			$menu_item->menu_item_parent = ! isset( $menu_item->menu_item_parent ) ? get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true ) : $menu_item->menu_item_parent;
-			$menu_item->object_id = ! isset( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id;
-			$menu_item->object = ! isset( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object;
-			$menu_item->type = ! isset( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type;
-
-			if ( 'post_type' == $menu_item->type ) {
-				$object = get_post_type_object( $menu_item->object );
-				if ( $object ) {
+			$menu_item->menu_item_parent = ! isset($menu_item->menu_item_parent) ? get_post_meta($menu_item->ID, '_menu_item_menu_item_parent', true) : $menu_item->menu_item_parent;
+			$menu_item->object_id = ! isset($menu_item->object_id) ? get_post_meta($menu_item->ID, '_menu_item_object_id', true) : $menu_item->object_id;
+			$menu_item->object = ! isset($menu_item->object) ? get_post_meta($menu_item->ID, '_menu_item_object', true) : $menu_item->object;
+			$menu_item->type = ! isset($menu_item->type) ? get_post_meta($menu_item->ID, '_menu_item_type', true) : $menu_item->type;
+
+			if ('post_type' == $menu_item->type) {
+				$object = get_post_type_object($menu_item->object);
+				if ($object) {
 					$menu_item->type_label = $object->labels->singular_name;
 				} else {
 					$menu_item->type_label = $menu_item->object;
 					$menu_item->_invalid = true;
 				}
 
-				$menu_item->url = get_permalink( $menu_item->object_id );
+				$menu_item->url = get_permalink($menu_item->object_id);
 
-				$original_object = get_post( $menu_item->object_id );
+				$original_object = get_post($menu_item->object_id);
 				$original_title = $original_object->post_title;
 
-				if ( '' === $original_title ) {
+				if ('' === $original_title) {
 					/* translators: %d: ID of a post */
-					$original_title = sprintf( __( '#%d (no title)' ), $original_object->ID );
+					$original_title = sprintf(__('#%d (no title)'), $original_object->ID);
 				}
 
 				$menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
-			} elseif ( 'taxonomy' == $menu_item->type ) {
-				$object = get_taxonomy( $menu_item->object );
-				if ( $object ) {
+			} elseif ('taxonomy' == $menu_item->type) {
+				$object = get_taxonomy($menu_item->object);
+				if ($object) {
 					$menu_item->type_label = $object->labels->singular_name;
 				} else {
 					$menu_item->type_label = $menu_item->object;
 					$menu_item->_invalid = true;
 				}
 
-				$term_url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
-				$menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';
+				$term_url = get_term_link((int) $menu_item->object_id, $menu_item->object);
+				$menu_item->url = ! is_wp_error($term_url) ? $term_url : '';
 
-				$original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
-				if ( is_wp_error( $original_title ) )
+				$original_title = get_term_field('name', $menu_item->object_id, $menu_item->object, 'raw');
+				if (is_wp_error($original_title))
 					$original_title = false;
 				$menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
 			} else {
 				$menu_item->type_label = __('Custom Link');
 				$menu_item->title = $menu_item->post_title;
-				$menu_item->url = ! isset( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
+				$menu_item->url = ! isset($menu_item->url) ? get_post_meta($menu_item->ID, '_menu_item_url', true) : $menu_item->url;
 			}
 
-			$menu_item->target = ! isset( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target;
+			$menu_item->target = ! isset($menu_item->target) ? get_post_meta($menu_item->ID, '_menu_item_target', true) : $menu_item->target;
 
 			/**
 			 * Filter a navigation menu item's title attribute.
@@ -750,9 +750,9 @@ 
 			 *
 			 * @param string $item_title The menu item title attribute.
 			 */
-			$menu_item->attr_title = ! isset( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title;
+			$menu_item->attr_title = ! isset($menu_item->attr_title) ? apply_filters('nav_menu_attr_title', $menu_item->post_excerpt) : $menu_item->attr_title;
 
-			if ( ! isset( $menu_item->description ) ) {
+			if ( ! isset($menu_item->description)) {
 				/**
 				 * Filter a navigation menu item's description.
 				 *
@@ -760,39 +760,39 @@ 
 				 *
 				 * @param string $description The menu item description.
 				 */
-				$menu_item->description = apply_filters( 'nav_menu_description', wp_trim_words( $menu_item->post_content, 200 ) );
+				$menu_item->description = apply_filters('nav_menu_description', wp_trim_words($menu_item->post_content, 200));
 			}
 
-			$menu_item->classes = ! isset( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes;
-			$menu_item->xfn = ! isset( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn;
+			$menu_item->classes = ! isset($menu_item->classes) ? (array) get_post_meta($menu_item->ID, '_menu_item_classes', true) : $menu_item->classes;
+			$menu_item->xfn = ! isset($menu_item->xfn) ? get_post_meta($menu_item->ID, '_menu_item_xfn', true) : $menu_item->xfn;
 		} else {
 			$menu_item->db_id = 0;
 			$menu_item->menu_item_parent = 0;
 			$menu_item->object_id = (int) $menu_item->ID;
 			$menu_item->type = 'post_type';
 
-			$object = get_post_type_object( $menu_item->post_type );
+			$object = get_post_type_object($menu_item->post_type);
 			$menu_item->object = $object->name;
 			$menu_item->type_label = $object->labels->singular_name;
 
-			if ( '' === $menu_item->post_title ) {
+			if ('' === $menu_item->post_title) {
 				/* translators: %d: ID of a post */
-				$menu_item->post_title = sprintf( __( '#%d (no title)' ), $menu_item->ID );
+				$menu_item->post_title = sprintf(__('#%d (no title)'), $menu_item->ID);
 			}
 
 			$menu_item->title = $menu_item->post_title;
-			$menu_item->url = get_permalink( $menu_item->ID );
+			$menu_item->url = get_permalink($menu_item->ID);
 			$menu_item->target = '';
 
 			/** This filter is documented in wp-includes/nav-menu.php */
-			$menu_item->attr_title = apply_filters( 'nav_menu_attr_title', '' );
+			$menu_item->attr_title = apply_filters('nav_menu_attr_title', '');
 
 			/** This filter is documented in wp-includes/nav-menu.php */
-			$menu_item->description = apply_filters( 'nav_menu_description', '' );
+			$menu_item->description = apply_filters('nav_menu_description', '');
 			$menu_item->classes = array();
 			$menu_item->xfn = '';
 		}
-	} elseif ( isset( $menu_item->taxonomy ) ) {
+	} elseif (isset($menu_item->taxonomy)) {
 		$menu_item->ID = $menu_item->term_id;
 		$menu_item->db_id = 0;
 		$menu_item->menu_item_parent = 0;
@@ -800,15 +800,15 @@ 
 		$menu_item->post_parent = (int) $menu_item->parent;
 		$menu_item->type = 'taxonomy';
 
-		$object = get_taxonomy( $menu_item->taxonomy );
+		$object = get_taxonomy($menu_item->taxonomy);
 		$menu_item->object = $object->name;
 		$menu_item->type_label = $object->labels->singular_name;
 
 		$menu_item->title = $menu_item->name;
-		$menu_item->url = get_term_link( $menu_item, $menu_item->taxonomy );
+		$menu_item->url = get_term_link($menu_item, $menu_item->taxonomy);
 		$menu_item->target = '';
 		$menu_item->attr_title = '';
-		$menu_item->description = get_term_field( 'description', $menu_item->term_id, $menu_item->taxonomy );
+		$menu_item->description = get_term_field('description', $menu_item->term_id, $menu_item->taxonomy);
 		$menu_item->classes = array();
 		$menu_item->xfn = '';
 
@@ -821,7 +821,7 @@ 
 	 *
 	 * @param object $menu_item The menu item object.
 	 */
-	return apply_filters( 'wp_setup_nav_menu_item', $menu_item );
+	return apply_filters('wp_setup_nav_menu_item', $menu_item);
 }
 
 /**
@@ -834,7 +834,7 @@ 
  * @param string $taxonomy    If $object_type is "taxonomy", $taxonomy is the name of the tax that $object_id belongs to
  * @return array The array of menu item IDs; empty array if none;
  */
-function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) {
+function wp_get_associated_nav_menu_items($object_id = 0, $object_type = 'post_type', $taxonomy = '') {
 	$object_id = (int) $object_id;
 	$menu_item_ids = array();
 
@@ -848,9 +848,9 @@ 
 			'posts_per_page' => -1,
 		)
 	);
-	foreach( (array) $menu_items as $menu_item ) {
-		if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
-			$menu_item_type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
+	foreach ((array) $menu_items as $menu_item) {
+		if (isset($menu_item->ID) && is_nav_menu_item($menu_item->ID)) {
+			$menu_item_type = get_post_meta($menu_item->ID, '_menu_item_type', true);
 			if (
 				'post_type' == $object_type &&
 				'post_type' == $menu_item_type
@@ -859,14 +859,14 @@ 
 			} elseif (
 				'taxonomy' == $object_type &&
 				'taxonomy' == $menu_item_type &&
-				get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
+				get_post_meta($menu_item->ID, '_menu_item_object', true) == $taxonomy
 			) {
 				$menu_item_ids[] = (int) $menu_item->ID;
 			}
 		}
 	}
 
-	return array_unique( $menu_item_ids );
+	return array_unique($menu_item_ids);
 }
 
 /**
@@ -878,13 +878,13 @@ 
  * @param int $object_id The ID of the original object being trashed.
  *
  */
-function _wp_delete_post_menu_item( $object_id = 0 ) {
+function _wp_delete_post_menu_item($object_id = 0) {
 	$object_id = (int) $object_id;
 
-	$menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'post_type' );
+	$menu_item_ids = wp_get_associated_nav_menu_items($object_id, 'post_type');
 
-	foreach( (array) $menu_item_ids as $menu_item_id ) {
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_item_ids as $menu_item_id) {
+		wp_delete_post($menu_item_id, true);
 	}
 }
 
@@ -897,13 +897,13 @@ 
  * @param int $object_id The ID of the original object being trashed.
  *
  */
-function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) {
+function _wp_delete_tax_menu_item($object_id = 0, $tt_id, $taxonomy) {
 	$object_id = (int) $object_id;
 
-	$menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy );
+	$menu_item_ids = wp_get_associated_nav_menu_items($object_id, 'taxonomy', $taxonomy);
 
-	foreach( (array) $menu_item_ids as $menu_item_id ) {
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_item_ids as $menu_item_id) {
+		wp_delete_post($menu_item_id, true);
 	}
 }
 
@@ -917,16 +917,16 @@ 
  * @param string $old_status The old status of the post object.
  * @param object $post       The post object being transitioned from one status to another.
  */
-function _wp_auto_add_pages_to_menu( $new_status, $old_status, $post ) {
-	if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type )
+function _wp_auto_add_pages_to_menu($new_status, $old_status, $post) {
+	if ('publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type)
 		return;
-	if ( ! empty( $post->post_parent ) )
+	if ( ! empty($post->post_parent))
 		return;
-	$auto_add = get_option( 'nav_menu_options' );
-	if ( empty( $auto_add ) || ! is_array( $auto_add ) || ! isset( $auto_add['auto_add'] ) )
+	$auto_add = get_option('nav_menu_options');
+	if (empty($auto_add) || ! is_array($auto_add) || ! isset($auto_add['auto_add']))
 		return;
 	$auto_add = $auto_add['auto_add'];
-	if ( empty( $auto_add ) || ! is_array( $auto_add ) )
+	if (empty($auto_add) || ! is_array($auto_add))
 		return;
 
 	$args = array(
@@ -936,14 +936,14 @@ 
 		'menu-item-status' => 'publish',
 	);
 
-	foreach ( $auto_add as $menu_id ) {
-		$items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-		if ( ! is_array( $items ) )
+	foreach ($auto_add as $menu_id) {
+		$items = wp_get_nav_menu_items($menu_id, array('post_status' => 'publish,draft'));
+		if ( ! is_array($items))
 			continue;
-		foreach ( $items as $item ) {
-			if ( $post->ID == $item->object_id )
+		foreach ($items as $item) {
+			if ($post->ID == $item->object_id)
 				continue 2;
 		}
-		wp_update_nav_menu_item( $menu_id, 0, $args );
+		wp_update_nav_menu_item($menu_id, 0, $args);
 	}
 }

Braces +90 added lines, -63 removed lines

@@ -60,8 +60,9 @@ 
  * @return bool Whether the menu exists.
  */
 function is_nav_menu( $menu ) {
-	if ( ! $menu )
-		return false;
+	if ( ! $menu ) {
+			return false;
+	}
 
 	$menu_obj = wp_get_nav_menu_object( $menu );
 
@@ -70,8 +71,9 @@ 
 		! is_wp_error( $menu_obj ) &&
 		! empty( $menu_obj->taxonomy ) &&
 		'nav_menu' == $menu_obj->taxonomy
-	)
-		return true;
+	) {
+			return true;
+	}
 
 	return false;
 }
@@ -136,8 +138,9 @@ 
  */
 function get_registered_nav_menus() {
 	global $_wp_registered_nav_menus;
-	if ( isset( $_wp_registered_nav_menus ) )
-		return $_wp_registered_nav_menus;
+	if ( isset( $_wp_registered_nav_menus ) ) {
+			return $_wp_registered_nav_menus;
+	}
 	return array();
 }
 
@@ -215,8 +218,9 @@ 
  */
 function wp_delete_nav_menu( $menu ) {
 	$menu = wp_get_nav_menu_object( $menu );
-	if ( ! $menu )
-		return false;
+	if ( ! $menu ) {
+			return false;
+	}
 
 	$menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' );
 	if ( ! empty( $menu_objects ) ) {
@@ -230,13 +234,14 @@ 
 	// Remove this menu from any locations.
 	$locations = get_nav_menu_locations();
 	foreach ( $locations as $location => $menu_id ) {
-		if ( $menu_id == $menu->term_id )
-			$locations[ $location ] = 0;
+		if ( $menu_id == $menu->term_id ) {
+					$locations[ $location ] = 0;
+		}
 	}
 	set_theme_mod( 'nav_menu_locations', $locations );
 
-	if ( $result && !is_wp_error($result) )
-
+	if ( $result && !is_wp_error($result) ) {
+	
 		/**
 		 * Fires after a navigation menu has been successfully deleted.
 		 *
@@ -245,6 +250,7 @@ 
 		 * @param int $term_id ID of the deleted menu.
 		 */
 		do_action( 'wp_delete_nav_menu', $menu->term_id );
+	}
 
 	return $result;
 }
@@ -277,20 +283,23 @@ 
 		! is_wp_error( $_possible_existing ) &&
 		isset( $_possible_existing->term_id ) &&
 		$_possible_existing->term_id != $menu_id
-	)
-		return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+	) {
+			return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+	}
 
 	// menu doesn't already exist, so create a new menu
 	if ( ! $_menu || is_wp_error( $_menu ) ) {
 		$menu_exists = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
 
-		if ( $menu_exists )
-			return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+		if ( $menu_exists ) {
+					return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
+		}
 
 		$_menu = wp_insert_term( $menu_data['menu-name'], 'nav_menu', $args );
 
-		if ( is_wp_error( $_menu ) )
-			return $_menu;
+		if ( is_wp_error( $_menu ) ) {
+					return $_menu;
+		}
 
 		/**
 		 * Fires after a navigation menu is successfully created.
@@ -305,15 +314,17 @@ 
 		return (int) $_menu['term_id'];
 	}
 
-	if ( ! $_menu || ! isset( $_menu->term_id ) )
-		return 0;
+	if ( ! $_menu || ! isset( $_menu->term_id ) ) {
+			return 0;
+	}
 
 	$menu_id = (int) $_menu->term_id;
 
 	$update_response = wp_update_term( $menu_id, 'nav_menu', $args );
 
-	if ( is_wp_error( $update_response ) )
-		return $update_response;
+	if ( is_wp_error( $update_response ) ) {
+			return $update_response;
+	}
 
 	$menu_id = (int) $update_response['term_id'];
 
@@ -344,8 +355,9 @@ 
 	$menu_item_db_id = (int) $menu_item_db_id;
 
 	// make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects
-	if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) )
-		return new WP_Error( 'update_nav_menu_item_failed', __( 'The given object ID is not that of a menu item.' ) );
+	if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) ) {
+			return new WP_Error( 'update_nav_menu_item_failed', __( 'The given object ID is not that of a menu item.' ) );
+	}
 
 	$menu = wp_get_nav_menu_object( $menu_id );
 
@@ -405,12 +417,14 @@ 
 			$original_title = $original_object->post_title;
 		}
 
-		if ( $args['menu-item-title'] == $original_title )
-			$args['menu-item-title'] = '';
+		if ( $args['menu-item-title'] == $original_title ) {
+					$args['menu-item-title'] = '';
+		}
 
 		// hack to get wp to create a post object when too many properties are empty
-		if ( '' ==  $args['menu-item-title'] && '' == $args['menu-item-description'] )
-			$args['menu-item-description'] = ' ';
+		if ( '' ==  $args['menu-item-title'] && '' == $args['menu-item-description'] ) {
+					$args['menu-item-description'] = ' ';
+		}
 	}
 
 	// Populate the menu item object
@@ -431,8 +445,9 @@ 
 		$post['ID'] = 0;
 		$post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
 		$menu_item_db_id = wp_insert_post( $post );
-		if ( ! $menu_item_db_id	|| is_wp_error( $menu_item_db_id ) )
-			return $menu_item_db_id;
+		if ( ! $menu_item_db_id	|| is_wp_error( $menu_item_db_id ) ) {
+					return $menu_item_db_id;
+		}
 	}
 
 	// Associate the menu item with the menu term
@@ -460,10 +475,11 @@ 
 	update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
 	update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
 
-	if ( 0 == $menu_id )
-		update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
-	elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) )
-		delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
+	if ( 0 == $menu_id ) {
+			update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
+	} elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) ) {
+			delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
+	}
 
 	// Update existing menu item. Default is publish status
 	if ( $update ) {
@@ -531,22 +547,25 @@ 
 function _sort_nav_menu_items( $a, $b ) {
 	global $_menu_item_sort_prop;
 
-	if ( empty( $_menu_item_sort_prop ) )
-		return 0;
+	if ( empty( $_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
-		return 0;
+	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
-		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
-		return $_a < $_b ? -1 : 1;
-	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
-}
+	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop ) {
+			return 0;
+	} elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop ) {
+			return $_a < $_b ? -1 : 1;
+	} else {
+			return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+	}
+	}
 
 /**
  * Return if a menu item is valid.
@@ -610,10 +629,11 @@ 
 			$object    = get_post_meta( $item->ID, '_menu_item_object',    true );
 			$type      = get_post_meta( $item->ID, '_menu_item_type',      true );
 
-			if ( 'post_type' == $type )
-				$posts[$object][] = $object_id;
-			elseif ( 'taxonomy' == $type)
-				$terms[$object][] = $object_id;
+			if ( 'post_type' == $type ) {
+							$posts[$object][] = $object_id;
+			} elseif ( 'taxonomy' == $type) {
+							$terms[$object][] = $object_id;
+			}
 		}
 
 		if ( ! empty( $posts ) ) {
@@ -731,8 +751,9 @@ 
 				$menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';
 
 				$original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
-				if ( is_wp_error( $original_title ) )
-					$original_title = false;
+				if ( is_wp_error( $original_title ) ) {
+									$original_title = false;
+				}
 				$menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
 			} else {
@@ -918,16 +939,20 @@ 
  * @param object $post       The post object being transitioned from one status to another.
  */
 function _wp_auto_add_pages_to_menu( $new_status, $old_status, $post ) {
-	if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type )
-		return;
-	if ( ! empty( $post->post_parent ) )
-		return;
+	if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type ) {
+			return;
+	}
+	if ( ! empty( $post->post_parent ) ) {
+			return;
+	}
 	$auto_add = get_option( 'nav_menu_options' );
-	if ( empty( $auto_add ) || ! is_array( $auto_add ) || ! isset( $auto_add['auto_add'] ) )
-		return;
+	if ( empty( $auto_add ) || ! is_array( $auto_add ) || ! isset( $auto_add['auto_add'] ) ) {
+			return;
+	}
 	$auto_add = $auto_add['auto_add'];
-	if ( empty( $auto_add ) || ! is_array( $auto_add ) )
-		return;
+	if ( empty( $auto_add ) || ! is_array( $auto_add ) ) {
+			return;
+	}
 
 	$args = array(
 		'menu-item-object-id' => $post->ID,
@@ -938,11 +963,13 @@ 
 
 	foreach ( $auto_add as $menu_id ) {
 		$items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-		if ( ! is_array( $items ) )
-			continue;
+		if ( ! is_array( $items ) ) {
+					continue;
+		}
 		foreach ( $items as $item ) {
-			if ( $post->ID == $item->object_id )
-				continue 2;
+			if ( $post->ID == $item->object_id ) {
+							continue 2;
+			}
 		}
 		wp_update_nav_menu_item( $menu_id, 0, $args );
 	}

src/wp-includes/default-constants.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Defines constants and global variables that can be overridden, generally in wp-config.php.
- *
- * @package WordPress
- */
+	 * Defines constants and global variables that can be overridden, generally in wp-config.php.
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Defines initial WordPress constants

Spacing +87 added lines, -87 removed lines

@@ -16,16 +16,16 @@ 
 	global $blog_id;
 
 	// set memory limits
-	if ( !defined('WP_MEMORY_LIMIT') ) {
-		if ( is_multisite() ) {
+	if ( ! defined('WP_MEMORY_LIMIT')) {
+		if (is_multisite()) {
 			define('WP_MEMORY_LIMIT', '64M');
 		} else {
 			define('WP_MEMORY_LIMIT', '40M');
 		}
 	}
 
-	if ( ! defined( 'WP_MAX_MEMORY_LIMIT' ) ) {
-		define( 'WP_MAX_MEMORY_LIMIT', '256M' );
+	if ( ! defined('WP_MAX_MEMORY_LIMIT')) {
+		define('WP_MAX_MEMORY_LIMIT', '256M');
 	}
 
 	/**
@@ -35,73 +35,73 @@ 
 	 * @global int $blog_id
 	 * @since 2.0.0
 	 */
-	if ( ! isset($blog_id) )
+	if ( ! isset($blog_id))
 		$blog_id = 1;
 
 	// set memory limits.
-	if ( function_exists( 'memory_get_usage' ) ) {
-		$current_limit = @ini_get( 'memory_limit' );
-		$current_limit_int = intval( $current_limit );
-		if ( false !== strpos( $current_limit, 'G' ) )
+	if (function_exists('memory_get_usage')) {
+		$current_limit = @ini_get('memory_limit');
+		$current_limit_int = intval($current_limit);
+		if (false !== strpos($current_limit, 'G'))
 			$current_limit_int *= 1024;
-		$wp_limit_int = intval( WP_MEMORY_LIMIT );
-		if ( false !== strpos( WP_MEMORY_LIMIT, 'G' ) )
+		$wp_limit_int = intval(WP_MEMORY_LIMIT);
+		if (false !== strpos(WP_MEMORY_LIMIT, 'G'))
 			$wp_limit_int *= 1024;
 
 		if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || $current_limit_int < $wp_limit_int ) )
-			@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
+			@ini_set('memory_limit', WP_MEMORY_LIMIT);
 	}
 
-	if ( !defined('WP_CONTENT_DIR') )
-		define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+	if ( ! defined('WP_CONTENT_DIR'))
+		define('WP_CONTENT_DIR', ABSPATH.'wp-content'); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
 
 	// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
-	if ( !defined('WP_DEBUG') )
-		define( 'WP_DEBUG', false );
+	if ( ! defined('WP_DEBUG'))
+		define('WP_DEBUG', false);
 
 	// Add define('WP_DEBUG_DISPLAY', null); to wp-config.php use the globally configured setting for
 	// display_errors and not force errors to be displayed. Use false to force display_errors off.
-	if ( !defined('WP_DEBUG_DISPLAY') )
-		define( 'WP_DEBUG_DISPLAY', true );
+	if ( ! defined('WP_DEBUG_DISPLAY'))
+		define('WP_DEBUG_DISPLAY', true);
 
 	// Add define('WP_DEBUG_LOG', true); to enable error logging to wp-content/debug.log.
-	if ( !defined('WP_DEBUG_LOG') )
+	if ( ! defined('WP_DEBUG_LOG'))
 		define('WP_DEBUG_LOG', false);
 
-	if ( !defined('WP_CACHE') )
+	if ( ! defined('WP_CACHE'))
 		define('WP_CACHE', false);
 
 	// Add define('SCRIPT_DEBUG', true); to wp-config.php to enable loading of non-minified,
 	// non-concatenated scripts and stylesheets.
-	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
-		if ( ! empty( $GLOBALS['wp_version'] ) ) {
-			$develop_src = false !== strpos( $GLOBALS['wp_version'], '-src' );
+	if ( ! defined('SCRIPT_DEBUG')) {
+		if ( ! empty($GLOBALS['wp_version'])) {
+			$develop_src = false !== strpos($GLOBALS['wp_version'], '-src');
 		} else {
 			$develop_src = false;
 		}
 
-		define( 'SCRIPT_DEBUG', $develop_src );
+		define('SCRIPT_DEBUG', $develop_src);
 	}
 
 	/**
 	 * Private
 	 */
-	if ( !defined('MEDIA_TRASH') )
+	if ( ! defined('MEDIA_TRASH'))
 		define('MEDIA_TRASH', false);
 
-	if ( !defined('SHORTINIT') )
+	if ( ! defined('SHORTINIT'))
 		define('SHORTINIT', false);
 
 	// Constants for features added to WP that should short-circuit their plugin implementations
-	define( 'WP_FEATURE_BETTER_PASSWORDS', true );
+	define('WP_FEATURE_BETTER_PASSWORDS', true);
 
 	// Constants for expressing human-readable intervals
 	// in their respective number of seconds.
-	define( 'MINUTE_IN_SECONDS', 60 );
-	define( 'HOUR_IN_SECONDS',   60 * MINUTE_IN_SECONDS );
-	define( 'DAY_IN_SECONDS',    24 * HOUR_IN_SECONDS   );
-	define( 'WEEK_IN_SECONDS',    7 * DAY_IN_SECONDS    );
-	define( 'YEAR_IN_SECONDS',  365 * DAY_IN_SECONDS    );
+	define('MINUTE_IN_SECONDS', 60);
+	define('HOUR_IN_SECONDS', 60 * MINUTE_IN_SECONDS);
+	define('DAY_IN_SECONDS', 24 * HOUR_IN_SECONDS);
+	define('WEEK_IN_SECONDS', 7 * DAY_IN_SECONDS);
+	define('YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS);
 }
 
 /**
@@ -112,24 +112,24 @@ 
  * @since 3.0.0
  */
 function wp_plugin_directory_constants() {
-	if ( !defined('WP_CONTENT_URL') )
-		define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+	if ( ! defined('WP_CONTENT_URL'))
+		define('WP_CONTENT_URL', get_option('siteurl').'/wp-content'); // full url - WP_CONTENT_DIR is defined further up
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
 	 *
 	 * @since 2.6.0
 	 */
-	if ( !defined('WP_PLUGIN_DIR') )
-		define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
+	if ( ! defined('WP_PLUGIN_DIR'))
+		define('WP_PLUGIN_DIR', WP_CONTENT_DIR.'/plugins'); // full path, no trailing slash
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
 	 *
 	 * @since 2.6.0
 	 */
-	if ( !defined('WP_PLUGIN_URL') )
-		define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
+	if ( ! defined('WP_PLUGIN_URL'))
+		define('WP_PLUGIN_URL', WP_CONTENT_URL.'/plugins'); // full url, no trailing slash
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
@@ -137,24 +137,24 @@ 
 	 * @since 2.1.0
 	 * @deprecated
 	 */
-	if ( !defined('PLUGINDIR') )
-		define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
+	if ( ! defined('PLUGINDIR'))
+		define('PLUGINDIR', 'wp-content/plugins'); // Relative to ABSPATH. For back compat.
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
 	 *
 	 * @since 2.8.0
 	 */
-	if ( !defined('WPMU_PLUGIN_DIR') )
-		define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
+	if ( ! defined('WPMU_PLUGIN_DIR'))
+		define('WPMU_PLUGIN_DIR', WP_CONTENT_DIR.'/mu-plugins'); // full path, no trailing slash
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
 	 *
 	 * @since 2.8.0
 	 */
-	if ( !defined('WPMU_PLUGIN_URL') )
-		define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
+	if ( ! defined('WPMU_PLUGIN_URL'))
+		define('WPMU_PLUGIN_URL', WP_CONTENT_URL.'/mu-plugins'); // full url, no trailing slash
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
@@ -162,8 +162,8 @@ 
 	 * @since 2.8.0
 	 * @deprecated
 	 */
-	if ( !defined( 'MUPLUGINDIR' ) )
-		define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
+	if ( ! defined('MUPLUGINDIR'))
+		define('MUPLUGINDIR', 'wp-content/mu-plugins'); // Relative to ABSPATH. For back compat.
 }
 
 /**
@@ -178,78 +178,78 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'COOKIEHASH' ) ) {
-		$siteurl = get_site_option( 'siteurl' );
-		if ( $siteurl )
-			define( 'COOKIEHASH', md5( $siteurl ) );
+	if ( ! defined('COOKIEHASH')) {
+		$siteurl = get_site_option('siteurl');
+		if ($siteurl)
+			define('COOKIEHASH', md5($siteurl));
 		else
-			define( 'COOKIEHASH', '' );
+			define('COOKIEHASH', '');
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('USER_COOKIE') )
-		define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
+	if ( ! defined('USER_COOKIE'))
+		define('USER_COOKIE', 'wordpressuser_'.COOKIEHASH);
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('PASS_COOKIE') )
-		define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
+	if ( ! defined('PASS_COOKIE'))
+		define('PASS_COOKIE', 'wordpresspass_'.COOKIEHASH);
 
 	/**
 	 * @since 2.5.0
 	 */
-	if ( !defined('AUTH_COOKIE') )
-		define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
+	if ( ! defined('AUTH_COOKIE'))
+		define('AUTH_COOKIE', 'wordpress_'.COOKIEHASH);
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('SECURE_AUTH_COOKIE') )
-		define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
+	if ( ! defined('SECURE_AUTH_COOKIE'))
+		define('SECURE_AUTH_COOKIE', 'wordpress_sec_'.COOKIEHASH);
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('LOGGED_IN_COOKIE') )
-		define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
+	if ( ! defined('LOGGED_IN_COOKIE'))
+		define('LOGGED_IN_COOKIE', 'wordpress_logged_in_'.COOKIEHASH);
 
 	/**
 	 * @since 2.3.0
 	 */
-	if ( !defined('TEST_COOKIE') )
+	if ( ! defined('TEST_COOKIE'))
 		define('TEST_COOKIE', 'wordpress_test_cookie');
 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined('COOKIEPATH') )
-		define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+	if ( ! defined('COOKIEPATH'))
+		define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home').'/'));
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined('SITECOOKIEPATH') )
-		define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+	if ( ! defined('SITECOOKIEPATH'))
+		define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl').'/'));
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('ADMIN_COOKIE_PATH') )
-		define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+	if ( ! defined('ADMIN_COOKIE_PATH'))
+		define('ADMIN_COOKIE_PATH', SITECOOKIEPATH.'wp-admin');
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('PLUGINS_COOKIE_PATH') )
-		define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
+	if ( ! defined('PLUGINS_COOKIE_PATH'))
+		define('PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL));
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') )
+	if ( ! defined('COOKIE_DOMAIN'))
 		define('COOKIE_DOMAIN', false);
 }
 
@@ -262,21 +262,21 @@ 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined( 'FORCE_SSL_ADMIN' ) ) {
-		if ( 'https' === parse_url( get_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
-			define( 'FORCE_SSL_ADMIN', true );
+	if ( ! defined('FORCE_SSL_ADMIN')) {
+		if ('https' === parse_url(get_option('siteurl'), PHP_URL_SCHEME)) {
+			define('FORCE_SSL_ADMIN', true);
 		} else {
-			define( 'FORCE_SSL_ADMIN', false );
+			define('FORCE_SSL_ADMIN', false);
 		}
 	}
-	force_ssl_admin( FORCE_SSL_ADMIN );
+	force_ssl_admin(FORCE_SSL_ADMIN);
 
 	/**
 	 * @since 2.6.0
 	 * @deprecated 4.0.0
 	 */
-	if ( defined( 'FORCE_SSL_LOGIN' ) && FORCE_SSL_LOGIN ) {
-		force_ssl_admin( true );
+	if (defined('FORCE_SSL_LOGIN') && FORCE_SSL_LOGIN) {
+		force_ssl_admin(true);
 	}
 }
 
@@ -289,23 +289,23 @@ 
 	/**
 	 * @since 2.5.0
 	 */
-	if ( !defined( 'AUTOSAVE_INTERVAL' ) )
-		define( 'AUTOSAVE_INTERVAL', 60 );
+	if ( ! defined('AUTOSAVE_INTERVAL'))
+		define('AUTOSAVE_INTERVAL', 60);
 
 	/**
 	 * @since 2.9.0
 	 */
-	if ( !defined( 'EMPTY_TRASH_DAYS' ) )
-		define( 'EMPTY_TRASH_DAYS', 30 );
+	if ( ! defined('EMPTY_TRASH_DAYS'))
+		define('EMPTY_TRASH_DAYS', 30);
 
-	if ( !defined('WP_POST_REVISIONS') )
+	if ( ! defined('WP_POST_REVISIONS'))
 		define('WP_POST_REVISIONS', true);
 
 	/**
 	 * @since 3.3.0
 	 */
-	if ( !defined( 'WP_CRON_LOCK_TIMEOUT' ) )
-		define('WP_CRON_LOCK_TIMEOUT', 60);  // In seconds
+	if ( ! defined('WP_CRON_LOCK_TIMEOUT'))
+		define('WP_CRON_LOCK_TIMEOUT', 60); // In seconds
 }
 
 /**
@@ -332,7 +332,7 @@ 
 	 * Will be used as the fallback if the current theme doesn't exist.
 	 * @since 3.0.0
 	 */
-	if ( !defined('WP_DEFAULT_THEME') )
-		define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
+	if ( ! defined('WP_DEFAULT_THEME'))
+		define('WP_DEFAULT_THEME', 'twentyfifteen');
 
 }

Braces +117 added lines, -73 removed lines

@@ -35,41 +35,51 @@ 
 	 * @global int $blog_id
 	 * @since 2.0.0
 	 */
-	if ( ! isset($blog_id) )
-		$blog_id = 1;
+	if ( ! isset($blog_id) ) {
+			$blog_id = 1;
+	}
 
 	// set memory limits.
 	if ( function_exists( 'memory_get_usage' ) ) {
 		$current_limit = @ini_get( 'memory_limit' );
 		$current_limit_int = intval( $current_limit );
-		if ( false !== strpos( $current_limit, 'G' ) )
-			$current_limit_int *= 1024;
+		if ( false !== strpos( $current_limit, 'G' ) ) {
+					$current_limit_int *= 1024;
+		}
 		$wp_limit_int = intval( WP_MEMORY_LIMIT );
-		if ( false !== strpos( WP_MEMORY_LIMIT, 'G' ) )
-			$wp_limit_int *= 1024;
+		if ( false !== strpos( WP_MEMORY_LIMIT, 'G' ) ) {
+					$wp_limit_int *= 1024;
+		}
 
-		if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || $current_limit_int < $wp_limit_int ) )
-			@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
+		if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || $current_limit_int < $wp_limit_int ) ) {
+					@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
+		}
 	}
 
-	if ( !defined('WP_CONTENT_DIR') )
-		define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+	if ( !defined('WP_CONTENT_DIR') ) {
+			define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
+	}
+	// no trailing slash, full paths only - WP_CONTENT_URL is defined further down
 
 	// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
-	if ( !defined('WP_DEBUG') )
-		define( 'WP_DEBUG', false );
+	if ( !defined('WP_DEBUG') ) {
+			define( 'WP_DEBUG', false );
+	}
 
 	// Add define('WP_DEBUG_DISPLAY', null); to wp-config.php use the globally configured setting for
 	// display_errors and not force errors to be displayed. Use false to force display_errors off.
-	if ( !defined('WP_DEBUG_DISPLAY') )
-		define( 'WP_DEBUG_DISPLAY', true );
+	if ( !defined('WP_DEBUG_DISPLAY') ) {
+			define( 'WP_DEBUG_DISPLAY', true );
+	}
 
 	// Add define('WP_DEBUG_LOG', true); to enable error logging to wp-content/debug.log.
-	if ( !defined('WP_DEBUG_LOG') )
-		define('WP_DEBUG_LOG', false);
+	if ( !defined('WP_DEBUG_LOG') ) {
+			define('WP_DEBUG_LOG', false);
+	}
 
-	if ( !defined('WP_CACHE') )
-		define('WP_CACHE', false);
+	if ( !defined('WP_CACHE') ) {
+			define('WP_CACHE', false);
+	}
 
 	// Add define('SCRIPT_DEBUG', true); to wp-config.php to enable loading of non-minified,
 	// non-concatenated scripts and stylesheets.
@@ -86,11 +96,13 @@ 
 	/**
 	 * Private
 	 */
-	if ( !defined('MEDIA_TRASH') )
-		define('MEDIA_TRASH', false);
+	if ( !defined('MEDIA_TRASH') ) {
+			define('MEDIA_TRASH', false);
+	}
 
-	if ( !defined('SHORTINIT') )
-		define('SHORTINIT', false);
+	if ( !defined('SHORTINIT') ) {
+			define('SHORTINIT', false);
+	}
 
 	// Constants for features added to WP that should short-circuit their plugin implementations
 	define( 'WP_FEATURE_BETTER_PASSWORDS', true );
@@ -112,24 +124,30 @@ 
  * @since 3.0.0
  */
 function wp_plugin_directory_constants() {
-	if ( !defined('WP_CONTENT_URL') )
-		define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+	if ( !defined('WP_CONTENT_URL') ) {
+			define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content');
+	}
+	// full url - WP_CONTENT_DIR is defined further up
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
 	 *
 	 * @since 2.6.0
 	 */
-	if ( !defined('WP_PLUGIN_DIR') )
-		define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
+	if ( !defined('WP_PLUGIN_DIR') ) {
+			define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' );
+	}
+	// full path, no trailing slash
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
 	 *
 	 * @since 2.6.0
 	 */
-	if ( !defined('WP_PLUGIN_URL') )
-		define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
+	if ( !defined('WP_PLUGIN_URL') ) {
+			define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' );
+	}
+	// full url, no trailing slash
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
@@ -137,24 +155,30 @@ 
 	 * @since 2.1.0
 	 * @deprecated
 	 */
-	if ( !defined('PLUGINDIR') )
-		define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
+	if ( !defined('PLUGINDIR') ) {
+			define( 'PLUGINDIR', 'wp-content/plugins' );
+	}
+	// Relative to ABSPATH. For back compat.
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
 	 *
 	 * @since 2.8.0
 	 */
-	if ( !defined('WPMU_PLUGIN_DIR') )
-		define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
+	if ( !defined('WPMU_PLUGIN_DIR') ) {
+			define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' );
+	}
+	// full path, no trailing slash
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
 	 *
 	 * @since 2.8.0
 	 */
-	if ( !defined('WPMU_PLUGIN_URL') )
-		define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
+	if ( !defined('WPMU_PLUGIN_URL') ) {
+			define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' );
+	}
+	// full url, no trailing slash
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
@@ -162,8 +186,10 @@ 
 	 * @since 2.8.0
 	 * @deprecated
 	 */
-	if ( !defined( 'MUPLUGINDIR' ) )
-		define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
+	if ( !defined( 'MUPLUGINDIR' ) ) {
+			define( 'MUPLUGINDIR', 'wp-content/mu-plugins' );
+	}
+	// Relative to ABSPATH. For back compat.
 }
 
 /**
@@ -180,78 +206,90 @@ 
 	 */
 	if ( !defined( 'COOKIEHASH' ) ) {
 		$siteurl = get_site_option( 'siteurl' );
-		if ( $siteurl )
-			define( 'COOKIEHASH', md5( $siteurl ) );
-		else
-			define( 'COOKIEHASH', '' );
+		if ( $siteurl ) {
+					define( 'COOKIEHASH', md5( $siteurl ) );
+		} else {
+					define( 'COOKIEHASH', '' );
+		}
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('USER_COOKIE') )
-		define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
+	if ( !defined('USER_COOKIE') ) {
+			define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
+	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('PASS_COOKIE') )
-		define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
+	if ( !defined('PASS_COOKIE') ) {
+			define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
+	}
 
 	/**
 	 * @since 2.5.0
 	 */
-	if ( !defined('AUTH_COOKIE') )
-		define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
+	if ( !defined('AUTH_COOKIE') ) {
+			define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('SECURE_AUTH_COOKIE') )
-		define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
+	if ( !defined('SECURE_AUTH_COOKIE') ) {
+			define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('LOGGED_IN_COOKIE') )
-		define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
+	if ( !defined('LOGGED_IN_COOKIE') ) {
+			define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
+	}
 
 	/**
 	 * @since 2.3.0
 	 */
-	if ( !defined('TEST_COOKIE') )
-		define('TEST_COOKIE', 'wordpress_test_cookie');
+	if ( !defined('TEST_COOKIE') ) {
+			define('TEST_COOKIE', 'wordpress_test_cookie');
+	}
 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined('COOKIEPATH') )
-		define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+	if ( !defined('COOKIEPATH') ) {
+			define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+	}
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined('SITECOOKIEPATH') )
-		define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+	if ( !defined('SITECOOKIEPATH') ) {
+			define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('ADMIN_COOKIE_PATH') )
-		define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+	if ( !defined('ADMIN_COOKIE_PATH') ) {
+			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('PLUGINS_COOKIE_PATH') )
-		define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
+	if ( !defined('PLUGINS_COOKIE_PATH') ) {
+			define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
+	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') )
-		define('COOKIE_DOMAIN', false);
-}
+	if ( !defined('COOKIE_DOMAIN') ) {
+			define('COOKIE_DOMAIN', false);
+	}
+	}
 
 /**
  * Defines cookie related WordPress constants
@@ -289,23 +327,28 @@ 
 	/**
 	 * @since 2.5.0
 	 */
-	if ( !defined( 'AUTOSAVE_INTERVAL' ) )
-		define( 'AUTOSAVE_INTERVAL', 60 );
+	if ( !defined( 'AUTOSAVE_INTERVAL' ) ) {
+			define( 'AUTOSAVE_INTERVAL', 60 );
+	}
 
 	/**
 	 * @since 2.9.0
 	 */
-	if ( !defined( 'EMPTY_TRASH_DAYS' ) )
-		define( 'EMPTY_TRASH_DAYS', 30 );
+	if ( !defined( 'EMPTY_TRASH_DAYS' ) ) {
+			define( 'EMPTY_TRASH_DAYS', 30 );
+	}
 
-	if ( !defined('WP_POST_REVISIONS') )
-		define('WP_POST_REVISIONS', true);
+	if ( !defined('WP_POST_REVISIONS') ) {
+			define('WP_POST_REVISIONS', true);
+	}
 
 	/**
 	 * @since 3.3.0
 	 */
-	if ( !defined( 'WP_CRON_LOCK_TIMEOUT' ) )
-		define('WP_CRON_LOCK_TIMEOUT', 60);  // In seconds
+	if ( !defined( 'WP_CRON_LOCK_TIMEOUT' ) ) {
+			define('WP_CRON_LOCK_TIMEOUT', 60);
+	}
+	// In seconds
 }
 
 /**
@@ -332,7 +375,8 @@ 
 	 * Will be used as the fallback if the current theme doesn't exist.
 	 * @since 3.0.0
 	 */
-	if ( !defined('WP_DEFAULT_THEME') )
-		define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
+	if ( !defined('WP_DEFAULT_THEME') ) {
+			define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
+	}
 
 }

src/wp-includes/functions.wp-scripts.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * BackPress Scripts Procedural API
- *
- * @since 2.6.0
- *
- * @package WordPress
- * @subpackage BackPress
- */
+	 * BackPress Scripts Procedural API
+	 *
+	 * @since 2.6.0
+	 *
+	 * @package WordPress
+	 * @subpackage BackPress
+	 */
 
 /**
  * Initialize $wp_scripts if it has not been set.

Spacing +48 added lines, -48 removed lines

@@ -19,7 +19,7 @@ 
  */
 function wp_scripts() {
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		$wp_scripts = new WP_Scripts();
 	}
 	return $wp_scripts;
@@ -33,17 +33,17 @@ 
  *
  * @param string $function Function name.
  */
-function _wp_scripts_maybe_doing_it_wrong( $function ) {
-	if ( did_action( 'init' ) ) {
+function _wp_scripts_maybe_doing_it_wrong($function) {
+	if (did_action('init')) {
 		return;
 	}
 
-	_doing_it_wrong( $function, sprintf(
-		__( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+	_doing_it_wrong($function, sprintf(
+		__('Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.'),
 		'<code>wp_enqueue_scripts</code>',
 		'<code>admin_enqueue_scripts</code>',
 		'<code>login_enqueue_scripts</code>'
-	), '3.3' );
+	), '3.3');
 }
 
 /**
@@ -62,27 +62,27 @@ 
  * @param string|bool|array $handles Optional. Scripts to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
-function wp_print_scripts( $handles = false ) {
+function wp_print_scripts($handles = false) {
 	/**
 	 * Fires before scripts in the $handles queue are printed.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_print_scripts' );
-	if ( '' === $handles ) { // for wp_head
+	do_action('wp_print_scripts');
+	if ('' === $handles) { // for wp_head
 		$handles = false;
 	}
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-		if ( ! $handles ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
+		if ( ! $handles) {
 			return array(); // No need to instantiate if nothing is there.
 		}
 	}
 
-	return wp_scripts()->do_items( $handles );
+	return wp_scripts()->do_items($handles);
 }
 
 /**
@@ -107,13 +107,13 @@ 
  *                               Default 'false'. Accepts 'false' or 'true'.
  * @return bool Whether the script has been registered. True on success, false on failure.
  */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_register_script($handle, $src, $deps = array(), $ver = false, $in_footer = false) {
 	$wp_scripts = wp_scripts();
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	$registered = $wp_scripts->add( $handle, $src, $deps, $ver );
-	if ( $in_footer ) {
-		$wp_scripts->add_data( $handle, 'group', 1 );
+	$registered = $wp_scripts->add($handle, $src, $deps, $ver);
+	if ($in_footer) {
+		$wp_scripts->add_data($handle, 'group', 1);
 	}
 
 	return $registered;
@@ -147,14 +147,14 @@ 
  * @param array $l10n         The data itself. The data can be either a single or multi-dimensional array.
  * @return bool True if the script was successfully localized, false otherwise.
  */
-function wp_localize_script( $handle, $object_name, $l10n ) {
+function wp_localize_script($handle, $object_name, $l10n) {
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-		_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
+		_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 		return false;
 	}
 
-	return $wp_scripts->localize( $handle, $object_name, $l10n );
+	return $wp_scripts->localize($handle, $object_name, $l10n);
 }
 
 /**
@@ -169,16 +169,16 @@ 
  *
  * @param string $handle Name of the script to be removed.
  */
-function wp_deregister_script( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_deregister_script($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	/**
 	 * Do not allow accidental or negligent de-registering of critical scripts in the admin.
 	 * Show minimal remorse if the correct hook is used.
 	 */
 	$current_filter = current_filter();
-	if ( ( is_admin() && 'admin_enqueue_scripts' !== $current_filter ) ||
-		( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter )
+	if ((is_admin() && 'admin_enqueue_scripts' !== $current_filter) ||
+		('wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter)
 	) {
 		$no = array(
 			'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui-core', 'jquery-ui-accordion',
@@ -189,15 +189,15 @@ 
 			'jquery-ui-tooltip', 'jquery-ui-widget', 'underscore', 'backbone',
 		);
 
-		if ( in_array( $handle, $no ) ) {
-			$message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook.' ),
-				"<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
-			_doing_it_wrong( __FUNCTION__, $message, '3.6' );
+		if (in_array($handle, $no)) {
+			$message = sprintf(__('Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook.'),
+				"<code>$handle</code>", '<code>wp_enqueue_scripts</code>');
+			_doing_it_wrong(__FUNCTION__, $message, '3.6');
 			return;
 		}
 	}
 
-	wp_scripts()->remove( $handle );
+	wp_scripts()->remove($handle);
 }
 
 /**
@@ -218,25 +218,25 @@ 
  * @param bool        $in_footer Optional. Whether to enqueue the script before </head> or before </body>.
  *                               Default 'false'. Accepts 'false' or 'true'.
  */
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_script($handle, $src = false, $deps = array(), $ver = false, $in_footer = false) {
 	$wp_scripts = wp_scripts();
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 
-	if ( $src || $in_footer ) {
-		$_handle = explode( '?', $handle );
+	if ($src || $in_footer) {
+		$_handle = explode('?', $handle);
 
-		if ( $src ) {
-			$wp_scripts->add( $_handle[0], $src, $deps, $ver );
+		if ($src) {
+			$wp_scripts->add($_handle[0], $src, $deps, $ver);
 		}
 
-		if ( $in_footer ) {
-			$wp_scripts->add_data( $_handle[0], 'group', 1 );
+		if ($in_footer) {
+			$wp_scripts->add_data($_handle[0], 'group', 1);
 		}
 	}
 
-	$wp_scripts->enqueue( $handle );
+	$wp_scripts->enqueue($handle);
 }
 
 /**
@@ -248,10 +248,10 @@ 
  *
  * @param string $handle Name of the script to be removed.
  */
-function wp_dequeue_script( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_dequeue_script($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_scripts()->dequeue( $handle );
+	wp_scripts()->dequeue($handle);
 }
 
 /**
@@ -265,10 +265,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether the script script is queued.
  */
-function wp_script_is( $handle, $list = 'enqueued' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_script_is($handle, $list = 'enqueued') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return (bool) wp_scripts()->query( $handle, $list );
+	return (bool) wp_scripts()->query($handle, $list);
 }
 
 /**
@@ -288,6 +288,6 @@ 
  * @param mixed  $value  String containing the data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_script_add_data( $handle, $key, $value ){
-	return wp_scripts()->add_data( $handle, $key, $value );
+function wp_script_add_data($handle, $key, $value) {
+	return wp_scripts()->add_data($handle, $key, $value);
 }

src/wp-includes/category.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * WordPress Category API
- *
- * @package WordPress
- */
+	 * WordPress Category API
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Retrieve list of category objects.

Spacing +63 added lines, -63 removed lines

@@ -19,9 +19,9 @@ 
  * @param string|array $args Optional. Change the defaults retrieving categories.
  * @return array List of categories.
  */
-function get_categories( $args = '' ) {
-	$defaults = array( 'taxonomy' => 'category' );
-	$args = wp_parse_args( $args, $defaults );
+function get_categories($args = '') {
+	$defaults = array('taxonomy' => 'category');
+	$args = wp_parse_args($args, $defaults);
 
 	$taxonomy = $args['taxonomy'];
 
@@ -33,18 +33,18 @@ 
 	 * @param string $taxonomy Taxonomy to retrieve terms from.
 	 * @param array  $args     An array of arguments. See {@see get_terms()}.
 	 */
-	$taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
+	$taxonomy = apply_filters('get_categories_taxonomy', $taxonomy, $args);
 
 	// Back compat
-	if ( isset($args['type']) && 'link' == $args['type'] ) {
-		_deprecated_argument( __FUNCTION__, '3.0', '' );
+	if (isset($args['type']) && 'link' == $args['type']) {
+		_deprecated_argument(__FUNCTION__, '3.0', '');
 		$taxonomy = $args['taxonomy'] = 'link_category';
 	}
 
-	$categories = (array) get_terms( $taxonomy, $args );
+	$categories = (array) get_terms($taxonomy, $args);
 
-	foreach ( array_keys( $categories ) as $k )
-		_make_cat_compat( $categories[$k] );
+	foreach (array_keys($categories) as $k)
+		_make_cat_compat($categories[$k]);
 
 	return $categories;
 }
@@ -71,13 +71,13 @@ 
  * @return object|array|WP_Error|null Category data in type defined by $output parameter.
  *                                    WP_Error if $category is empty, null if it does not exist.
  */
-function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
-	$category = get_term( $category, 'category', $output, $filter );
+function get_category($category, $output = OBJECT, $filter = 'raw') {
+	$category = get_term($category, 'category', $output, $filter);
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return $category;
 
-	_make_cat_compat( $category );
+	_make_cat_compat($category);
 
 	return $category;
 }
@@ -101,45 +101,45 @@ 
  * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
  * @return object|array|WP_Error|void Type is based on $output value.
  */
-function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
-	$category_path = rawurlencode( urldecode( $category_path ) );
-	$category_path = str_replace( '%2F', '/', $category_path );
-	$category_path = str_replace( '%20', ' ', $category_path );
-	$category_paths = '/' . trim( $category_path, '/' );
-	$leaf_path  = sanitize_title( basename( $category_paths ) );
-	$category_paths = explode( '/', $category_paths );
+function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
+	$category_path = rawurlencode(urldecode($category_path));
+	$category_path = str_replace('%2F', '/', $category_path);
+	$category_path = str_replace('%20', ' ', $category_path);
+	$category_paths = '/'.trim($category_path, '/');
+	$leaf_path = sanitize_title(basename($category_paths));
+	$category_paths = explode('/', $category_paths);
 	$full_path = '';
-	foreach ( (array) $category_paths as $pathdir ) {
-		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
+	foreach ((array) $category_paths as $pathdir) {
+		$full_path .= ($pathdir != '' ? '/' : '').sanitize_title($pathdir);
 	}
-	$categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
+	$categories = get_terms('category', array('get' => 'all', 'slug' => $leaf_path));
 
-	if ( empty( $categories ) ) {
+	if (empty($categories)) {
 		return;
 	}
 
-	foreach ( $categories as $category ) {
-		$path = '/' . $leaf_path;
+	foreach ($categories as $category) {
+		$path = '/'.$leaf_path;
 		$curcategory = $category;
-		while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
-			$curcategory = get_term( $curcategory->parent, 'category' );
-			if ( is_wp_error( $curcategory ) ) {
+		while (($curcategory->parent != 0) && ($curcategory->parent != $curcategory->term_id)) {
+			$curcategory = get_term($curcategory->parent, 'category');
+			if (is_wp_error($curcategory)) {
 				return $curcategory;
 			}
-			$path = '/' . $curcategory->slug . $path;
+			$path = '/'.$curcategory->slug.$path;
 		}
 
-		if ( $path == $full_path ) {
-			$category = get_term( $category->term_id, 'category', $output );
-			_make_cat_compat( $category );
+		if ($path == $full_path) {
+			$category = get_term($category->term_id, 'category', $output);
+			_make_cat_compat($category);
 			return $category;
 		}
 	}
 
 	// If full matching is not required, return the first cat that matches the leaf.
-	if ( ! $full_match ) {
-		$category = get_term( reset( $categories )->term_id, 'category', $output );
-		_make_cat_compat( $category );
+	if ( ! $full_match) {
+		$category = get_term(reset($categories)->term_id, 'category', $output);
+		_make_cat_compat($category);
 		return $category;
 	}
 }
@@ -152,10 +152,10 @@ 
  * @param string $slug The category slug.
  * @return object Category data object
  */
-function get_category_by_slug( $slug  ) {
-	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+function get_category_by_slug($slug) {
+	$category = get_term_by('slug', $slug, 'category');
+	if ($category)
+		_make_cat_compat($category);
 
 	return $category;
 }
@@ -168,9 +168,9 @@ 
  * @param string $cat_name Category name.
  * @return int 0, if failure and ID of category on success.
  */
-function get_cat_ID( $cat_name ) {
-	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
+function get_cat_ID($cat_name) {
+	$cat = get_term_by('name', $cat_name, 'category');
+	if ($cat)
 		return $cat->term_id;
 	return 0;
 }
@@ -183,10 +183,10 @@ 
  * @param int $cat_id Category ID
  * @return string Category name, or an empty string if category doesn't exist.
  */
-function get_cat_name( $cat_id ) {
+function get_cat_name($cat_id) {
 	$cat_id = (int) $cat_id;
-	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
+	$category = get_term($cat_id, 'category');
+	if ( ! $category || is_wp_error($category))
 		return '';
 	return $category->name;
 }
@@ -203,8 +203,8 @@ 
  * @param int|object $cat2 The child category.
  * @return bool Whether $cat2 is child of $cat1
  */
-function cat_is_ancestor_of( $cat1, $cat2 ) {
-	return term_is_ancestor_of( $cat1, $cat2, 'category' );
+function cat_is_ancestor_of($cat1, $cat2) {
+	return term_is_ancestor_of($cat1, $cat2, 'category');
 }
 
 /**
@@ -216,8 +216,8 @@ 
  * @param string $context Optional. Default is 'display'.
  * @return object|array Same type as $category with sanitized data for safe use.
  */
-function sanitize_category( $category, $context = 'display' ) {
-	return sanitize_term( $category, 'category', $context );
+function sanitize_category($category, $context = 'display') {
+	return sanitize_term($category, 'category', $context);
 }
 
 /**
@@ -231,8 +231,8 @@ 
  * @param string $context What filter to use, 'raw', 'display', etc.
  * @return mixed Same type as $value after $value has been sanitized.
  */
-function sanitize_category_field( $field, $value, $cat_id, $context ) {
-	return sanitize_term_field( $field, $value, $cat_id, 'category', $context );
+function sanitize_category_field($field, $value, $cat_id, $context) {
+	return sanitize_term_field($field, $value, $cat_id, 'category', $context);
 }
 
 /* Tags */
@@ -246,10 +246,10 @@ 
  * @param string|array $args Tag arguments to use when retrieving tags.
  * @return array List of tags.
  */
-function get_tags( $args = '' ) {
-	$tags = get_terms( 'post_tag', $args );
+function get_tags($args = '') {
+	$tags = get_terms('post_tag', $args);
 
-	if ( empty( $tags ) ) {
+	if (empty($tags)) {
 		$return = array();
 		return $return;
 	}
@@ -262,7 +262,7 @@ 
 	 * @param array $tags Array of 'post_tag' term objects.
 	 * @param array $args An array of arguments. @see get_terms()
 	 */
-	$tags = apply_filters( 'get_tags', $tags, $args );
+	$tags = apply_filters('get_tags', $tags, $args);
 	return $tags;
 }
 
@@ -285,8 +285,8 @@ 
  * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
  * @return object|array|WP_Error|null Tag data in type defined by $output parameter. WP_Error if $tag is empty, null if it does not exist.
  */
-function get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
-	return get_term( $tag, 'post_tag', $output, $filter );
+function get_tag($tag, $output = OBJECT, $filter = 'raw') {
+	return get_term($tag, 'post_tag', $output, $filter);
 }
 
 /* Cache */
@@ -298,8 +298,8 @@ 
  *
  * @param int $id Category ID
  */
-function clean_category_cache( $id ) {
-	clean_term_cache( $id, 'category' );
+function clean_category_cache($id) {
+	clean_term_cache($id, 'category');
 }
 
 /**
@@ -321,15 +321,15 @@ 
  *
  * @param array|object $category Category Row object or array
  */
-function _make_cat_compat( &$category ) {
-	if ( is_object( $category ) && ! is_wp_error( $category ) ) {
+function _make_cat_compat(&$category) {
+	if (is_object($category) && ! is_wp_error($category)) {
 		$category->cat_ID = &$category->term_id;
 		$category->category_count = &$category->count;
 		$category->category_description = &$category->description;
 		$category->cat_name = &$category->name;
 		$category->category_nicename = &$category->slug;
 		$category->category_parent = &$category->parent;
-	} elseif ( is_array( $category ) && isset( $category['term_id'] ) ) {
+	} elseif (is_array($category) && isset($category['term_id'])) {
 		$category['cat_ID'] = &$category['term_id'];
 		$category['category_count'] = &$category['count'];
 		$category['category_description'] = &$category['description'];

Braces +15 added lines, -10 removed lines

@@ -43,8 +43,9 @@ 
 
 	$categories = (array) get_terms( $taxonomy, $args );
 
-	foreach ( array_keys( $categories ) as $k )
-		_make_cat_compat( $categories[$k] );
+	foreach ( array_keys( $categories ) as $k ) {
+			_make_cat_compat( $categories[$k] );
+	}
 
 	return $categories;
 }
@@ -74,8 +75,9 @@ 
 function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
 	$category = get_term( $category, 'category', $output, $filter );
 
-	if ( is_wp_error( $category ) )
-		return $category;
+	if ( is_wp_error( $category ) ) {
+			return $category;
+	}
 
 	_make_cat_compat( $category );
 
@@ -154,8 +156,9 @@ 
  */
 function get_category_by_slug( $slug  ) {
 	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+	if ( $category ) {
+			_make_cat_compat( $category );
+	}
 
 	return $category;
 }
@@ -170,8 +173,9 @@ 
  */
 function get_cat_ID( $cat_name ) {
 	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
-		return $cat->term_id;
+	if ( $cat ) {
+			return $cat->term_id;
+	}
 	return 0;
 }
 
@@ -186,8 +190,9 @@ 
 function get_cat_name( $cat_id ) {
 	$cat_id = (int) $cat_id;
 	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
-		return '';
+	if ( ! $category || is_wp_error( $category ) ) {
+			return '';
+	}
 	return $category->name;
 }
 

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Customize Panel classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.0.0
- */
+	 * WordPress Customize Panel classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 4.0.0
+	 */
 
 /**
  * Customize Panel class.

Spacing +35 added lines, -35 removed lines

@@ -148,18 +148,18 @@ 
 	 * @param string               $id      An specific ID for the panel.
 	 * @param array                $args    Panel arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
@@ -177,7 +177,7 @@ 
 	 */
 	final public function active() {
 		$panel = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of WP_Customize_Panel::active().
@@ -187,7 +187,7 @@ 
 		 * @param bool               $active  Whether the Customizer panel is active.
 		 * @param WP_Customize_Panel $panel   {@see WP_Customize_Panel} instance.
 		 */
-		$active = apply_filters( 'customize_panel_active', $active, $panel );
+		$active = apply_filters('customize_panel_active', $active, $panel);
 
 		return $active;
 	}
@@ -215,8 +215,8 @@ 
 	 * @return array The array to be exported to the client as JSON.
 	 */
 	public function json() {
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array = wp_array_slice_assoc((array) $this, array('id', 'description', 'priority', 'type'));
+		$array['title'] = html_entity_decode($this->title, ENT_QUOTES, get_bloginfo('charset'));
 		$array['content'] = $this->get_content();
 		$array['active'] = $this->active();
 		$array['instanceNumber'] = $this->instance_number;
@@ -232,11 +232,11 @@ 
 	 * @return bool False if theme doesn't support the panel or the user doesn't have the capability.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
@@ -253,7 +253,7 @@ 
 	final public function get_content() {
 		ob_start();
 		$this->maybe_render();
-		return trim( ob_get_clean() );
+		return trim(ob_get_clean());
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 * @since 4.0.0
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -273,7 +273,7 @@ 
 		 *
 		 * @param WP_Customize_Panel $this WP_Customize_Panel instance.
 		 */
-		do_action( 'customize_render_panel', $this );
+		do_action('customize_render_panel', $this);
 
 		/**
 		 * Fires before rendering a specific Customizer panel.
@@ -283,7 +283,7 @@ 
 		 *
 		 * @since 4.0.0
 		 */
-		do_action( "customize_render_panel_{$this->id}" );
+		do_action("customize_render_panel_{$this->id}");
 
 		$this->render();
 	}
@@ -320,10 +320,10 @@ 
 	 */
 	public function print_template() {
 		?>
-		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr( $this->type ); ?>-content">
+		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr($this->type); ?>-content">
 			<?php $this->content_template(); ?>
 		</script>
-		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr( $this->type ); ?>">
+		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr($this->type); ?>">
 			<?php $this->render_template(); ?>
 		</script>
         <?php
@@ -345,7 +345,7 @@ 
 		<li id="accordion-panel-{{ data.id }}" class="accordion-section control-section control-panel control-panel-{{ data.type }}">
 			<h3 class="accordion-section-title" tabindex="0">
 				{{ data.title }}
-				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Press return or enter to open this panel'); ?></span>
 			</h3>
 			<ul class="accordion-sub-container control-panel-content"></ul>
 		</li>
@@ -366,13 +366,13 @@ 
 	protected function content_template() {
 		?>
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
-			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></button>
+			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e('Back'); ?></span></button>
 			<div class="accordion-section-title">
 				<span class="preview-notice"><?php
 					/* translators: %s is the site/panel title in the Customizer */
-					echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
+					echo sprintf(__('You are customizing %s'), '<strong class="panel-title">{{ data.title }}</strong>');
 				?></span>
-				<button class="customize-help-toggle dashicons dashicons-editor-help" tabindex="0" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+				<button class="customize-help-toggle dashicons dashicons-editor-help" tabindex="0" aria-expanded="false"><span class="screen-reader-text"><?php _e('Help'); ?></span></button>
 			</div>
 			<# if ( data.description ) { #>
 				<div class="description customize-panel-description">
@@ -412,10 +412,10 @@ 
 	 */
 	public function render_screen_options() {
 		// Essentially adds the screen options.
-		add_filter( 'manage_nav-menus_columns', array( $this, 'wp_nav_menu_manage_columns' ) );
+		add_filter('manage_nav-menus_columns', array($this, 'wp_nav_menu_manage_columns'));
 
 		// Display screen options.
-		$screen = WP_Screen::get( 'nav-menus.php' );
+		$screen = WP_Screen::get('nav-menus.php');
 		$screen->render_screen_options();
 	}
 
@@ -431,13 +431,13 @@ 
 	 */
 	public function wp_nav_menu_manage_columns() {
 		return array(
-			'_title'      => __( 'Show advanced menu properties' ),
+			'_title'      => __('Show advanced menu properties'),
 			'cb'          => '<input type="checkbox" />',
-			'link-target' => __( 'Link Target' ),
-			'attr-title'  => __( 'Title Attribute' ),
-			'css-classes' => __( 'CSS Classes' ),
-			'xfn'         => __( 'Link Relationship (XFN)' ),
-			'description' => __( 'Description' ),
+			'link-target' => __('Link Target'),
+			'attr-title'  => __('Title Attribute'),
+			'css-classes' => __('CSS Classes'),
+			'xfn'         => __('Link Relationship (XFN)'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -456,20 +456,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 is 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/class-wp-ajax-response.php

Spacing +27 added lines, -27 removed lines

@@ -22,8 +22,8 @@ 
 	 *
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
-	public function __construct( $args = '' ) {
-		if ( !empty($args) )
+	public function __construct($args = '') {
+		if ( ! empty($args))
 			$this->add($args);
 	}
 
@@ -50,7 +50,7 @@ 
 	 * @param string|array $args Override defaults.
 	 * @return string XML response.
 	 */
-	public function add( $args = '' ) {
+	public function add($args = '') {
 		$defaults = array(
 			'what' => 'object', 'action' => false,
 			'id' => '0', 'old_id' => false,
@@ -58,39 +58,39 @@ 
 			'data' => '', 'supplemental' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		$position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
+		$position = preg_replace('/[^a-z0-9:_-]/i', '', $r['position']);
 		$id = $r['id'];
 		$what = $r['what'];
 		$action = $r['action'];
 		$old_id = $r['old_id'];
 		$data = $r['data'];
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$data = $id;
 			$id = 0;
 		}
 
 		$response = '';
-		if ( is_wp_error( $data ) ) {
-			foreach ( (array) $data->get_error_codes() as $code ) {
-				$response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
-				if ( ! $error_data = $data->get_error_data( $code ) ) {
+		if (is_wp_error($data)) {
+			foreach ((array) $data->get_error_codes() as $code) {
+				$response .= "<wp_error code='$code'><![CDATA[".$data->get_error_message($code)."]]></wp_error>";
+				if ( ! $error_data = $data->get_error_data($code)) {
 					continue;
 				}
 				$class = '';
-				if ( is_object( $error_data ) ) {
-					$class = ' class="' . get_class( $error_data ) . '"';
-					$error_data = get_object_vars( $error_data );
+				if (is_object($error_data)) {
+					$class = ' class="'.get_class($error_data).'"';
+					$error_data = get_object_vars($error_data);
 				}
 
 				$response .= "<wp_error_data code='$code'$class>";
 
-				if ( is_scalar( $error_data ) ) {
+				if (is_scalar($error_data)) {
 					$response .= "<![CDATA[$error_data]]>";
-				} elseif ( is_array( $error_data ) ) {
-					foreach ( $error_data as $k => $v ) {
+				} elseif (is_array($error_data)) {
+					foreach ($error_data as $k => $v) {
 						$response .= "<$k><![CDATA[$v]]></$k>";
 					}
 				}
@@ -102,22 +102,22 @@ 
 		}
 
 		$s = '';
-		if ( is_array( $r['supplemental'] ) ) {
-			foreach ( $r['supplemental'] as $k => $v ) {
+		if (is_array($r['supplemental'])) {
+			foreach ($r['supplemental'] as $k => $v) {
 				$s .= "<$k><![CDATA[$v]]></$k>";
 			}
 			$s = "<supplemental>$s</supplemental>";
 		}
 
-		if ( false === $action ) {
+		if (false === $action) {
 			$action = $_POST['action'];
 		}
 		$x = '';
 		$x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-		$x .=	"<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
-		$x .=		$response;
-		$x .=		$s;
-		$x .=	"</$what>";
+		$x .= "<$what id='$id' ".(false === $old_id ? '' : "old_id='$old_id' ")."position='$position'>";
+		$x .= $response;
+		$x .= $s;
+		$x .= "</$what>";
 		$x .= "</response>";
 
 		$this->responses[] = $x;
@@ -132,12 +132,12 @@ 
 	 * @since 2.1.0
 	 */
 	public function send() {
-		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
-		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
+		header('Content-Type: text/xml; charset='.get_option('blog_charset'));
+		echo "<?xml version='1.0' encoding='".get_option('blog_charset')."' standalone='yes'?><wp_ajax>";
+		foreach ((array) $this->responses as $response)
 			echo $response;
 		echo '</wp_ajax>';
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+		if (defined('DOING_AJAX') && DOING_AJAX)
 			wp_die();
 		else
 			die();

Braces +11 added lines, -8 removed lines

@@ -23,8 +23,9 @@ 
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
 	public function __construct( $args = '' ) {
-		if ( !empty($args) )
-			$this->add($args);
+		if ( !empty($args) ) {
+					$this->add($args);
+		}
 	}
 
 	/**
@@ -134,12 +135,14 @@ 
 	public function send() {
 		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
 		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
-			echo $response;
+		foreach ( (array) $this->responses as $response ) {
+					echo $response;
+		}
 		echo '</wp_ajax>';
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-			wp_die();
-		else
-			die();
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+					wp_die();
+		} else {
+					die();
+		}
 	}
 }

src/wp-includes/meta.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * 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
- * @since 2.9.0
- */
+	 * 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
+	 * @since 2.9.0
+	 */
 
 /**
  * Add metadata for the specified object.

Spacing +302 added lines, -302 removed lines

@@ -31,26 +31,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.
@@ -68,17 +68,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.
@@ -92,20 +92,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.
@@ -120,7 +120,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;
 }
@@ -144,28 +144,28 @@ 
 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)
 	$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 ) ) {
+	$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, $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,11 +227,11 @@ 
 		 * @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 ) {
-		foreach ( $meta_ids as $meta_id ) {
+	if ('post' == $meta_type) {
+		foreach ($meta_ids as $meta_id) {
 			/**
 			 * Fires immediately before updating a post's metadata.
 			 *
@@ -242,17 +242,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.
 		 *
@@ -266,11 +266,11 @@ 
 		 * @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 ) {
-		foreach ( $meta_ids as $meta_id ) {
+	if ('post' == $meta_type) {
+		foreach ($meta_ids as $meta_id) {
 			/**
 			 * Fires immediately after updating a post's metadata.
 			 *
@@ -281,7 +281,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);
 		}
 	}
 
@@ -311,21 +311,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);
@@ -348,27 +348,27 @@ 
 	 *                              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 )
-		$object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key ) );
+	if ($delete_all)
+		$object_ids = $wpdb->get_col($wpdb->prepare("SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key));
 
 	/**
 	 * Fires immediately before deleting metadata of a specific type.
@@ -383,10 +383,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.
 		 *
@@ -394,22 +394,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');
 	}
 
 	/**
@@ -425,10 +425,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.
 		 *
@@ -436,7 +436,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;
@@ -457,12 +457,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;
 	}
 
@@ -481,28 +481,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]);
 	}
@@ -523,29 +523,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;
@@ -562,32 +562,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;
 }
@@ -605,44 +605,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(
@@ -655,27 +655,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;
@@ -696,37 +696,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.
 			 *
@@ -737,20 +737,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.
 			 *
@@ -761,7 +761,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;
@@ -786,53 +786,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:
@@ -840,10 +840,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;
@@ -863,9 +863,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);
 }
 
 /**
@@ -991,17 +991,17 @@ 
 	 *     }
 	 * }
 	 */
-	public function __construct( $meta_query = false ) {
-		if ( !$meta_query )
+	public function __construct($meta_query = false) {
+		if ( ! $meta_query)
 			return;
 
-		if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
+		if (isset($meta_query['relation']) && strtoupper($meta_query['relation']) == 'OR') {
 			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
 
-		$this->queries = $this->sanitize_query( $meta_query );
+		$this->queries = $this->sanitize_query($meta_query);
 	}
 
 	/**
@@ -1015,44 +1015,44 @@ 
 	 * @param array $queries Array of query clauses.
 	 * @return array Sanitized array of query clauses.
 	 */
-	public function sanitize_query( $queries ) {
+	public function sanitize_query($queries) {
 		$clean_queries = array();
 
-		if ( ! is_array( $queries ) ) {
+		if ( ! is_array($queries)) {
 			return $clean_queries;
 		}
 
-		foreach ( $queries as $key => $query ) {
-			if ( 'relation' === $key ) {
+		foreach ($queries as $key => $query) {
+			if ('relation' === $key) {
 				$relation = $query;
 
-			} elseif ( ! is_array( $query ) ) {
+			} elseif ( ! is_array($query)) {
 				continue;
 
 			// First-order clause.
-			} elseif ( $this->is_first_order_clause( $query ) ) {
-				if ( isset( $query['value'] ) && array() === $query['value'] ) {
-					unset( $query['value'] );
+			} elseif ($this->is_first_order_clause($query)) {
+				if (isset($query['value']) && array() === $query['value']) {
+					unset($query['value']);
 				}
 
-				$clean_queries[ $key ] = $query;
+				$clean_queries[$key] = $query;
 
 			// Otherwise, it's a nested query, so we recurse.
 			} else {
-				$cleaned_query = $this->sanitize_query( $query );
+				$cleaned_query = $this->sanitize_query($query);
 
-				if ( ! empty( $cleaned_query ) ) {
-					$clean_queries[ $key ] = $cleaned_query;
+				if ( ! empty($cleaned_query)) {
+					$clean_queries[$key] = $cleaned_query;
 				}
 			}
 		}
 
-		if ( empty( $clean_queries ) ) {
+		if (empty($clean_queries)) {
 			return $clean_queries;
 		}
 
 		// Sanitize the 'relation' key provided in the query.
-		if ( isset( $relation ) && 'OR' === strtoupper( $relation ) ) {
+		if (isset($relation) && 'OR' === strtoupper($relation)) {
 			$clean_queries['relation'] = 'OR';
 			$this->has_or_relation = true;
 
@@ -1061,7 +1061,7 @@ 
 		 * This value will not actually be used to join clauses, but it
 		 * simplifies the logic around combining key-only queries.
 		 */
-		} elseif ( 1 === count( $clean_queries ) ) {
+		} elseif (1 === count($clean_queries)) {
 			$clean_queries['relation'] = 'OR';
 
 		// Default to AND.
@@ -1084,8 +1084,8 @@ 
 	 * @param array $query Meta query arguments.
 	 * @return bool Whether the query clause is a first-order clause.
 	 */
-	protected function is_first_order_clause( $query ) {
-		return isset( $query['key'] ) || isset( $query['value'] );
+	protected function is_first_order_clause($query) {
+		return isset($query['key']) || isset($query['value']);
 	}
 
 	/**
@@ -1096,7 +1096,7 @@ 
 	 *
 	 * @param array $qv The query variables
 	 */
-	public function parse_query_vars( $qv ) {
+	public function parse_query_vars($qv) {
 		$meta_query = array();
 
 		/*
@@ -1106,34 +1106,34 @@ 
 		 * the rest of the meta_query).
 		 */
 		$primary_meta_query = array();
-		foreach ( array( 'key', 'compare', 'type' ) as $key ) {
-			if ( ! empty( $qv[ "meta_$key" ] ) ) {
-				$primary_meta_query[ $key ] = $qv[ "meta_$key" ];
+		foreach (array('key', 'compare', 'type') as $key) {
+			if ( ! empty($qv["meta_$key"])) {
+				$primary_meta_query[$key] = $qv["meta_$key"];
 			}
 		}
 
 		// WP_Query sets 'meta_value' = '' by default.
-		if ( isset( $qv['meta_value'] ) && '' !== $qv['meta_value'] && ( ! is_array( $qv['meta_value'] ) || $qv['meta_value'] ) ) {
+		if (isset($qv['meta_value']) && '' !== $qv['meta_value'] && ( ! is_array($qv['meta_value']) || $qv['meta_value'])) {
 			$primary_meta_query['value'] = $qv['meta_value'];
 		}
 
-		$existing_meta_query = isset( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ? $qv['meta_query'] : array();
+		$existing_meta_query = isset($qv['meta_query']) && is_array($qv['meta_query']) ? $qv['meta_query'] : array();
 
-		if ( ! empty( $primary_meta_query ) && ! empty( $existing_meta_query ) ) {
+		if ( ! empty($primary_meta_query) && ! empty($existing_meta_query)) {
 			$meta_query = array(
 				'relation' => 'AND',
 				$primary_meta_query,
 				$existing_meta_query,
 			);
-		} elseif ( ! empty( $primary_meta_query ) ) {
+		} elseif ( ! empty($primary_meta_query)) {
 			$meta_query = array(
 				$primary_meta_query,
 			);
-		} elseif ( ! empty( $existing_meta_query ) ) {
+		} elseif ( ! empty($existing_meta_query)) {
 			$meta_query = $existing_meta_query;
 		}
 
-		$this->__construct( $meta_query );
+		$this->__construct($meta_query);
 	}
 
 	/**
@@ -1145,16 +1145,16 @@ 
 	 * @param string $type MySQL type to cast meta_value.
 	 * @return string MySQL type.
 	 */
-	public function get_cast_for_type( $type = '' ) {
-		if ( empty( $type ) )
+	public function get_cast_for_type($type = '') {
+		if (empty($type))
 			return 'CHAR';
 
-		$meta_type = strtoupper( $type );
+		$meta_type = strtoupper($type);
 
-		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) )
+		if ( ! preg_match('/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type))
 			return 'CHAR';
 
-		if ( 'NUMERIC' == $meta_type )
+		if ('NUMERIC' == $meta_type)
 			$meta_type = 'SIGNED';
 
 		return $meta_type;
@@ -1177,13 +1177,13 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql( $type, $primary_table, $primary_id_column, $context = null ) {
-		if ( ! $meta_table = _get_meta_table( $type ) ) {
+	public function get_sql($type, $primary_table, $primary_id_column, $context = null) {
+		if ( ! $meta_table = _get_meta_table($type)) {
 			return false;
 		}
 
 		$this->meta_table     = $meta_table;
-		$this->meta_id_column = sanitize_key( $type . '_id' );
+		$this->meta_id_column = sanitize_key($type.'_id');
 
 		$this->primary_table     = $primary_table;
 		$this->primary_id_column = $primary_id_column;
@@ -1194,8 +1194,8 @@ 
 		 * If any JOINs are LEFT JOINs (as in the case of NOT EXISTS), then all JOINs should
 		 * be LEFT. Otherwise posts with no metadata will be excluded from results.
 		 */
-		if ( false !== strpos( $sql['join'], 'LEFT JOIN' ) ) {
-			$sql['join'] = str_replace( 'INNER JOIN', 'LEFT JOIN', $sql['join'] );
+		if (false !== strpos($sql['join'], 'LEFT JOIN')) {
+			$sql['join'] = str_replace('INNER JOIN', 'LEFT JOIN', $sql['join']);
 		}
 
 		/**
@@ -1214,7 +1214,7 @@ 
 		 *     @type object $context           The main query object.
 		 * }
 		 */
-		return apply_filters_ref_array( 'get_meta_sql', array( $sql, $this->queries, $type, $primary_table, $primary_id_column, $context ) );
+		return apply_filters_ref_array('get_meta_sql', array($sql, $this->queries, $type, $primary_table, $primary_id_column, $context));
 	}
 
 	/**
@@ -1239,10 +1239,10 @@ 
 		 * To keep $this->queries unaltered, pass a copy.
 		 */
 		$queries = $this->queries;
-		$sql = $this->get_sql_for_query( $queries );
+		$sql = $this->get_sql_for_query($queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -1267,7 +1267,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( &$query, $depth = 0 ) {
+	protected function get_sql_for_query(&$query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -1279,32 +1279,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => &$clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => &$clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query, $key );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query, $key);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -1313,21 +1313,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -1354,7 +1354,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
+	public function get_sql_for_clause(&$clause, $parent_query, $clause_key = '') {
 		global $wpdb;
 
 		$sql_chunks = array(
@@ -1362,20 +1362,20 @@ 
 			'join' => array(),
 		);
 
-		if ( isset( $clause['compare'] ) ) {
-			$clause['compare'] = strtoupper( $clause['compare'] );
+		if (isset($clause['compare'])) {
+			$clause['compare'] = strtoupper($clause['compare']);
 		} else {
-			$clause['compare'] = isset( $clause['value'] ) && is_array( $clause['value'] ) ? 'IN' : '=';
+			$clause['compare'] = isset($clause['value']) && is_array($clause['value']) ? 'IN' : '=';
 		}
 
-		if ( ! in_array( $clause['compare'], array(
+		if ( ! in_array($clause['compare'], array(
 			'=', '!=', '>', '>=', '<', '<=',
 			'LIKE', 'NOT LIKE',
 			'IN', 'NOT IN',
 			'BETWEEN', 'NOT BETWEEN',
 			'EXISTS', 'NOT EXISTS',
 			'REGEXP', 'NOT REGEXP', 'RLIKE'
-		) ) ) {
+		))) {
 			$clause['compare'] = '=';
 		}
 
@@ -1385,16 +1385,16 @@ 
 		$join = '';
 
 		// We prefer to avoid joins if possible. Look for an existing join compatible with this clause.
-		$alias = $this->find_compatible_table_alias( $clause, $parent_query );
-		if ( false === $alias ) {
-			$i = count( $this->table_aliases );
-			$alias = $i ? 'mt' . $i : $this->meta_table;
+		$alias = $this->find_compatible_table_alias($clause, $parent_query);
+		if (false === $alias) {
+			$i = count($this->table_aliases);
+			$alias = $i ? 'mt'.$i : $this->meta_table;
 
 			// JOIN clauses for NOT EXISTS have their own syntax.
-			if ( 'NOT EXISTS' === $meta_compare ) {
+			if ('NOT EXISTS' === $meta_compare) {
 				$join .= " LEFT JOIN $this->meta_table";
 				$join .= $i ? " AS $alias" : '';
-				$join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
+				$join .= $wpdb->prepare(" ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key']);
 
 			// All other JOIN clauses.
 			} else {
@@ -1411,72 +1411,72 @@ 
 		$clause['alias'] = $alias;
 
 		// Determine the data type.
-		$_meta_type = isset( $clause['type'] ) ? $clause['type'] : '';
-		$meta_type  = $this->get_cast_for_type( $_meta_type );
+		$_meta_type = isset($clause['type']) ? $clause['type'] : '';
+		$meta_type  = $this->get_cast_for_type($_meta_type);
 		$clause['cast'] = $meta_type;
 
 		// Fallback for clause keys is the table alias.
-		if ( ! $clause_key ) {
+		if ( ! $clause_key) {
 			$clause_key = $clause['alias'];
 		}
 
 		// Ensure unique clause keys, so none are overwritten.
 		$iterator = 1;
 		$clause_key_base = $clause_key;
-		while ( isset( $this->clauses[ $clause_key ] ) ) {
-			$clause_key = $clause_key_base . '-' . $iterator;
+		while (isset($this->clauses[$clause_key])) {
+			$clause_key = $clause_key_base.'-'.$iterator;
 			$iterator++;
 		}
 
 		// Store the clause in our flat array.
-		$this->clauses[ $clause_key ] =& $clause;
+		$this->clauses[$clause_key] = & $clause;
 
 		// Next, build the WHERE clause.
 
 		// meta_key.
-		if ( array_key_exists( 'key', $clause ) ) {
-			if ( 'NOT EXISTS' === $meta_compare ) {
-				$sql_chunks['where'][] = $alias . '.' . $this->meta_id_column . ' IS NULL';
+		if (array_key_exists('key', $clause)) {
+			if ('NOT EXISTS' === $meta_compare) {
+				$sql_chunks['where'][] = $alias.'.'.$this->meta_id_column.' IS NULL';
 			} else {
-				$sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
+				$sql_chunks['where'][] = $wpdb->prepare("$alias.meta_key = %s", trim($clause['key']));
 			}
 		}
 
 		// meta_value.
-		if ( array_key_exists( 'value', $clause ) ) {
+		if (array_key_exists('value', $clause)) {
 			$meta_value = $clause['value'];
 
-			if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
-				if ( ! is_array( $meta_value ) ) {
-					$meta_value = preg_split( '/[,\s]+/', $meta_value );
+			if (in_array($meta_compare, array('IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'))) {
+				if ( ! is_array($meta_value)) {
+					$meta_value = preg_split('/[,\s]+/', $meta_value);
 				}
 			} else {
-				$meta_value = trim( $meta_value );
+				$meta_value = trim($meta_value);
 			}
 
-			switch ( $meta_compare ) {
+			switch ($meta_compare) {
 				case 'IN' :
 				case 'NOT IN' :
-					$meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
-					$where = $wpdb->prepare( $meta_compare_string, $meta_value );
+					$meta_compare_string = '('.substr(str_repeat(',%s', count($meta_value)), 1).')';
+					$where = $wpdb->prepare($meta_compare_string, $meta_value);
 					break;
 
 				case 'BETWEEN' :
 				case 'NOT BETWEEN' :
-					$meta_value = array_slice( $meta_value, 0, 2 );
-					$where = $wpdb->prepare( '%s AND %s', $meta_value );
+					$meta_value = array_slice($meta_value, 0, 2);
+					$where = $wpdb->prepare('%s AND %s', $meta_value);
 					break;
 
 				case 'LIKE' :
 				case 'NOT LIKE' :
-					$meta_value = '%' . $wpdb->esc_like( $meta_value ) . '%';
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$meta_value = '%'.$wpdb->esc_like($meta_value).'%';
+					$where = $wpdb->prepare('%s', $meta_value);
 					break;
 
 				// EXISTS with a value is interpreted as '='.
 				case 'EXISTS' :
 					$meta_compare = '=';
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$where = $wpdb->prepare('%s', $meta_value);
 					break;
 
 				// 'value' is ignored for NOT EXISTS.
@@ -1485,12 +1485,12 @@ 
 					break;
 
 				default :
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$where = $wpdb->prepare('%s', $meta_value);
 					break;
 
 			}
 
-			if ( $where ) {
+			if ($where) {
 				$sql_chunks['where'][] = "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$where}";
 			}
 		}
@@ -1499,8 +1499,8 @@ 
 		 * Multiple WHERE clauses (for meta_key and meta_value) should
 		 * be joined in parentheses.
 		 */
-		if ( 1 < count( $sql_chunks['where'] ) ) {
-			$sql_chunks['where'] = array( '( ' . implode( ' AND ', $sql_chunks['where'] ) . ' )' );
+		if (1 < count($sql_chunks['where'])) {
+			$sql_chunks['where'] = array('( '.implode(' AND ', $sql_chunks['where']).' )');
 		}
 
 		return $sql_chunks;
@@ -1542,34 +1542,34 @@ 
 	 * @param  array       $parent_query Parent query of $clause.
 	 * @return string|bool Table alias if found, otherwise false.
 	 */
-	protected function find_compatible_table_alias( $clause, $parent_query ) {
+	protected function find_compatible_table_alias($clause, $parent_query) {
 		$alias = false;
 
-		foreach ( $parent_query as $sibling ) {
+		foreach ($parent_query as $sibling) {
 			// If the sibling has no alias yet, there's nothing to check.
-			if ( empty( $sibling['alias'] ) ) {
+			if (empty($sibling['alias'])) {
 				continue;
 			}
 
 			// We're only interested in siblings that are first-order clauses.
-			if ( ! is_array( $sibling ) || ! $this->is_first_order_clause( $sibling ) ) {
+			if ( ! is_array($sibling) || ! $this->is_first_order_clause($sibling)) {
 				continue;
 			}
 
 			$compatible_compares = array();
 
 			// Clauses connected by OR can share joins as long as they have "positive" operators.
-			if ( 'OR' === $parent_query['relation'] ) {
-				$compatible_compares = array( '=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=' );
+			if ('OR' === $parent_query['relation']) {
+				$compatible_compares = array('=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=');
 
 			// Clauses joined by AND with "negative" operators share a join only if they also share a key.
-			} elseif ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
-				$compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
+			} elseif (isset($sibling['key']) && isset($clause['key']) && $sibling['key'] === $clause['key']) {
+				$compatible_compares = array('!=', 'NOT IN', 'NOT LIKE');
 			}
 
-			$clause_compare  = strtoupper( $clause['compare'] );
-			$sibling_compare = strtoupper( $sibling['compare'] );
-			if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
+			$clause_compare  = strtoupper($clause['compare']);
+			$sibling_compare = strtoupper($sibling['compare']);
+			if (in_array($clause_compare, $compatible_compares) && in_array($sibling_compare, $compatible_compares)) {
 				$alias = $sibling['alias'];
 				break;
 			}
@@ -1585,7 +1585,7 @@ 
 		 * @param array       $parent_query Parent of $clause.
 		 * @param object      $this         WP_Meta_Query object.
 		 */
-		return apply_filters( 'meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this ) ;
+		return apply_filters('meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this);
 	}
 
 	/**
@@ -1617,9 +1617,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;
@@ -1634,8 +1634,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.
@@ -1646,7 +1646,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);
 }
 
 /**
@@ -1659,7 +1659,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.
@@ -1675,7 +1675,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);
 }
 
 /**
@@ -1688,17 +1688,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 +111 added lines, -78 removed lines

@@ -69,13 +69,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 );
@@ -100,8 +102,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;
+			}
 		}
 	}
 
@@ -247,8 +252,9 @@ 
 	}
 
 	$result = $wpdb->update( $table, $data, $where );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	wp_cache_delete($object_id, $meta_type . '_meta');
 
@@ -349,26 +355,31 @@ 
 	 *                              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 )
-		$object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key ) );
+	if ( $delete_all ) {
+			$object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key ) );
+	}
 
 	/**
 	 * Fires immediately before deleting metadata of a specific type.
@@ -401,8 +412,9 @@ 
 
 	$count = $wpdb->query($query);
 
-	if ( !$count )
-		return false;
+	if ( !$count ) {
+			return false;
+	}
 
 	if ( $delete_all ) {
 		foreach ( (array) $object_ids as $o_id ) {
@@ -483,10 +495,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');
@@ -501,17 +514,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
@@ -535,8 +550,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' );
 
@@ -545,8 +561,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;
 }
@@ -583,11 +600,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;
 }
@@ -664,8 +683,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');
@@ -809,14 +829,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 );
@@ -830,10 +852,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;
@@ -841,8 +865,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 );
 	}
 
@@ -992,8 +1017,9 @@ 
 	 * }
 	 */
 	public function __construct( $meta_query = false ) {
-		if ( !$meta_query )
-			return;
+		if ( !$meta_query ) {
+					return;
+		}
 
 		if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
 			$this->relation = 'OR';
@@ -1146,16 +1172,19 @@ 
 	 * @return string MySQL type.
 	 */
 	public function get_cast_for_type( $type = '' ) {
-		if ( empty( $type ) )
-			return 'CHAR';
+		if ( empty( $type ) ) {
+					return 'CHAR';
+		}
 
 		$meta_type = strtoupper( $type );
 
-		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) )
-			return 'CHAR';
+		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) ) {
+					return 'CHAR';
+		}
 
-		if ( 'NUMERIC' == $meta_type )
-			$meta_type = 'SIGNED';
+		if ( 'NUMERIC' == $meta_type ) {
+					$meta_type = 'SIGNED';
+		}
 
 		return $meta_type;
 	}
@@ -1619,8 +1648,9 @@ 
 
 	$table_name = $type . 'meta';
 
-	if ( empty($wpdb->$table_name) )
-		return false;
+	if ( empty($wpdb->$table_name) ) {
+			return false;
+	}
 
 	return $wpdb->$table_name;
 }
@@ -1689,16 +1719,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/registration.php

Indentation +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Deprecated. No longer needed.
- *
- * @package WordPress
- */
+		 * Deprecated. No longer needed.
+		 *
+		 * @package WordPress
+		 */
 _deprecated_file( basename(__FILE__), '3.1', null, __( 'This file no longer needs to be included.' ) );

Spacing +1 added lines, -1 removed lines

@@ -4,4 +4,4 @@
  *
  * @package WordPress
  */
-_deprecated_file( basename(__FILE__), '3.1', null, __( 'This file no longer needs to be included.' ) );
+_deprecated_file(basename(__FILE__), '3.1', null, __('This file no longer needs to be included.'));

src/wp-includes/class-feed.php

Spacing +25 added lines, -25 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( !class_exists('SimplePie') )
-	require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+if ( ! class_exists('SimplePie'))
+	require_once(ABSPATH.WPINC.'/class-simplepie.php');
 
 class WP_Feed_Cache extends SimplePie_Cache {
 	/**
@@ -21,8 +21,8 @@ 
 	public $lifetime = 43200; //Default lifetime in cache of 12 hours
 
 	public function __construct($location, $filename, $extension) {
-		$this->name = 'feed_' . $filename;
-		$this->mod_name = 'feed_mod_' . $filename;
+		$this->name = 'feed_'.$filename;
+		$this->mod_name = 'feed_mod_'.$filename;
 
 		$lifetime = $this->lifetime;
 		/**
@@ -33,14 +33,14 @@ 
 		 * @param int    $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
 		 * @param string $filename Unique identifier for the cache object.
 		 */
-		$this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
+		$this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $lifetime, $filename);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function save($data) {
-		if ( $data instanceof SimplePie ) {
+		if ($data instanceof SimplePie) {
 			$data = $data->data;
 		}
 
@@ -91,27 +91,27 @@ 
 
 		$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
-		if ( preg_match('/^http(s)?:\/\//i', $url) ) {
+		if (preg_match('/^http(s)?:\/\//i', $url)) {
 			$args = array(
 				'timeout' => $this->timeout,
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
+			if ( ! empty($this->headers))
 				$args['headers'] = $this->headers;
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if (SIMPLEPIE_USERAGENT != $this->useragent) //Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
 
 			$res = wp_safe_remote_request($url, $args);
 
-			if ( is_wp_error($res) ) {
-				$this->error = 'WP HTTP Error: ' . $res->get_error_message();
+			if (is_wp_error($res)) {
+				$this->error = 'WP HTTP Error: '.$res->get_error_message();
 				$this->success = false;
 			} else {
-				$this->headers = wp_remote_retrieve_headers( $res );
-				$this->body = wp_remote_retrieve_body( $res );
-				$this->status_code = wp_remote_retrieve_response_code( $res );
+				$this->headers = wp_remote_retrieve_headers($res);
+				$this->body = wp_remote_retrieve_body($res);
+				$this->status_code = wp_remote_retrieve_response_code($res);
 			}
 		} else {
 			$this->error = '';
@@ -130,27 +130,27 @@ 
  * @since 3.5.0
  */
 class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
-	public function sanitize( $data, $type, $base = '' ) {
-		$data = trim( $data );
-		if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
-			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
+	public function sanitize($data, $type, $base = '') {
+		$data = trim($data);
+		if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML) {
+			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data)) {
 				$type |= SIMPLEPIE_CONSTRUCT_HTML;
 			}
 			else {
 				$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 			}
 		}
-		if ( $type & SIMPLEPIE_CONSTRUCT_BASE64 ) {
-			$data = base64_decode( $data );
+		if ($type & SIMPLEPIE_CONSTRUCT_BASE64) {
+			$data = base64_decode($data);
 		}
-		if ( $type & ( SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML ) ) {
-			$data = wp_kses_post( $data );
-			if ( $this->output_encoding !== 'UTF-8' ) {
-				$data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
+		if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML)) {
+			$data = wp_kses_post($data);
+			if ($this->output_encoding !== 'UTF-8') {
+				$data = $this->registry->call('Misc', 'change_encoding', array($data, 'UTF-8', $this->output_encoding));
 			}
 			return $data;
 		} else {
-			return parent::sanitize( $data, $type, $base );
+			return parent::sanitize($data, $type, $base);
 		}
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if ( !class_exists('SimplePie') )
+if ( !class_exists('SimplePie') ) {
 	require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+}
 
 class WP_Feed_Cache extends SimplePie_Cache {
 	/**
@@ -97,11 +98,14 @@ 
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
-				$args['headers'] = $this->headers;
+			if ( !empty($this->headers) ) {
+							$args['headers'] = $this->headers;
+			}
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if ( SIMPLEPIE_USERAGENT != $this->useragent ) {
+				//Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
+			}
 
 			$res = wp_safe_remote_request($url, $args);
 
@@ -135,8 +139,7 @@ 
 		if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
 			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
 				$type |= SIMPLEPIE_CONSTRUCT_HTML;
-			}
-			else {
+			} else {
 				$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 			}
 		}