ntwb / wordpress

src/wp-includes/class-wp-text-diff-renderer-inline.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);
-		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-		$words  = str_replace( "\n", $newlineEscape, $words );
+		$words  = preg_split('/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$words  = str_replace("\n", $newlineEscape, $words);
 		return $words;
 	}
 

src/wp-includes/class-wp-site.php

Spacing +33 added lines, -33 removed lines

@@ -166,27 +166,27 @@ 
 	 * @param int $site_id The ID of the site to retrieve.
 	 * @return WP_Site|false The site's object if found. False if not.
 	 */
-	public static function get_instance( $site_id ) {
+	public static function get_instance($site_id) {
 		global $wpdb;
 
 		$site_id = (int) $site_id;
-		if ( ! $site_id ) {
+		if ( ! $site_id) {
 			return false;
 		}
 
-		$_site = wp_cache_get( $site_id, 'sites' );
+		$_site = wp_cache_get($site_id, 'sites');
 
-		if ( ! $_site ) {
-			$_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = %d LIMIT 1", $site_id ) );
+		if ( ! $_site) {
+			$_site = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->blogs} WHERE blog_id = %d LIMIT 1", $site_id));
 
-			if ( empty( $_site ) || is_wp_error( $_site ) ) {
+			if (empty($_site) || is_wp_error($_site)) {
 				return false;
 			}
 
-			wp_cache_add( $site_id, $_site, 'sites' );
+			wp_cache_add($site_id, $_site, 'sites');
 		}
 
-		return new WP_Site( $_site );
+		return new WP_Site($_site);
 	}
 
 	/**
@@ -200,8 +200,8 @@ 
 	 *
 	 * @param WP_Site|object $site A site object.
 	 */
-	public function __construct( $site ) {
-		foreach( get_object_vars( $site ) as $key => $value ) {
+	public function __construct($site) {
+		foreach (get_object_vars($site) as $key => $value) {
 			$this->$key = $value;
 		}
 	}
@@ -215,7 +215,7 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		return get_object_vars( $this );
+		return get_object_vars($this);
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @param string $key Property to get.
 	 * @return mixed Value of the property. Null if not available.
 	 */
-	public function __get( $key ) {
-		switch ( $key ) {
+	public function __get($key) {
+		switch ($key) {
 			case 'id':
 				return (int) $this->blog_id;
 			case 'network_id':
@@ -240,7 +240,7 @@ 
 			case 'siteurl':
 			case 'post_count':
 			case 'home':
-				if ( ! did_action( 'ms_loaded' ) ) {
+				if ( ! did_action('ms_loaded')) {
 					return null;
 				}
 				$details = $this->get_details();
@@ -262,8 +262,8 @@ 
 	 * @param string $key Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $key ) {
-		switch ( $key ) {
+	public function __isset($key) {
+		switch ($key) {
 			case 'id':
 			case 'network_id':
 				return true;
@@ -271,7 +271,7 @@ 
 			case 'siteurl':
 			case 'post_count':
 			case 'home':
-				if ( ! did_action( 'ms_loaded' ) ) {
+				if ( ! did_action('ms_loaded')) {
 					return false;
 				}
 				return true;
@@ -291,8 +291,8 @@ 
 	 * @param string $key   Property to set.
 	 * @param mixed  $value Value to assign to the property.
 	 */
-	public function __set( $key, $value ) {
-		switch ( $key ) {
+	public function __set($key, $value) {
+		switch ($key) {
 			case 'id':
 				$this->blog_id = (string) $value;
 				break;
@@ -317,37 +317,37 @@ 
 	 * @return stdClass A raw site object with all details included.
 	 */
 	private function get_details() {
-		$details = wp_cache_get( $this->blog_id, 'site-details' );
+		$details = wp_cache_get($this->blog_id, 'site-details');
 
-		if ( false === $details ) {
+		if (false === $details) {
 
-			switch_to_blog( $this->blog_id );
+			switch_to_blog($this->blog_id);
 			// Create a raw copy of the object for backwards compatibility with the filter below.
 			$details = new stdClass();
-			foreach ( get_object_vars( $this ) as $key => $value ) {
+			foreach (get_object_vars($this) as $key => $value) {
 				$details->$key = $value;
 			}
-			$details->blogname   = get_option( 'blogname' );
-			$details->siteurl    = get_option( 'siteurl' );
-			$details->post_count = get_option( 'post_count' );
-			$details->home       = get_option( 'home' );
+			$details->blogname   = get_option('blogname');
+			$details->siteurl    = get_option('siteurl');
+			$details->post_count = get_option('post_count');
+			$details->home       = get_option('home');
 			restore_current_blog();
 
 			$cache_details = true;
-			foreach ( array( 'blogname', 'siteurl', 'post_count', 'home' ) as $field ) {
-				if ( false === $details->$field ) {
+			foreach (array('blogname', 'siteurl', 'post_count', 'home') as $field) {
+				if (false === $details->$field) {
 					$cache_details = false;
 					break;
 				}
 			}
 
-			if ( $cache_details ) {
-				wp_cache_set( $this->blog_id, $details, 'site-details' );
+			if ($cache_details) {
+				wp_cache_set($this->blog_id, $details, 'site-details');
 			}
 		}
 
 		/** This filter is documented in wp-includes/ms-blogs.php */
-		$details = apply_filters_deprecated( 'blog_details', array( $details ), '4.7.0', 'site_details' );
+		$details = apply_filters_deprecated('blog_details', array($details), '4.7.0', 'site_details');
 
 		/**
 		 * Filters a site's extended properties.
@@ -356,7 +356,7 @@ 
 		 *
 		 * @param stdClass $details The site details.
 		 */
-		$details = apply_filters( 'site_details', $details );
+		$details = apply_filters('site_details', $details);
 
 		return $details;
 	}

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

Spacing +36 added lines, -36 removed lines

@@ -19,7 +19,7 @@ 
  */
 function wp_styles() {
 	global $wp_styles;
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
 		$wp_styles = new WP_Styles();
 	}
 	return $wp_styles;
@@ -39,8 +39,8 @@ 
  * @param string|bool|array $handles Styles to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
-function wp_print_styles( $handles = false ) {
-	if ( '' === $handles ) { // for wp_head
+function wp_print_styles($handles = false) {
+	if ('' === $handles) { // for wp_head
 		$handles = false;
 	}
 	/**
@@ -48,20 +48,20 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	if ( ! $handles ) {
-		do_action( 'wp_print_styles' );
+	if ( ! $handles) {
+		do_action('wp_print_styles');
 	}
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	global $wp_styles;
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
-		if ( ! $handles ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
+		if ( ! $handles) {
 			return array(); // No need to instantiate if nothing is there.
 		}
 	}
 
-	return wp_styles()->do_items( $handles );
+	return wp_styles()->do_items($handles);
 }
 
 /**
@@ -80,20 +80,20 @@ 
  * @param string $data   String containing the CSS styles to be added.
  * @return bool True on success, false on failure.
  */
-function wp_add_inline_style( $handle, $data ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_add_inline_style($handle, $data) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	if ( false !== stripos( $data, '</style>' ) ) {
-		_doing_it_wrong( __FUNCTION__, sprintf(
+	if (false !== stripos($data, '</style>')) {
+		_doing_it_wrong(__FUNCTION__, sprintf(
 			/* translators: 1: <style>, 2: wp_add_inline_style() */
-			__( 'Do not pass %1$s tags to %2$s.' ),
+			__('Do not pass %1$s tags to %2$s.'),
 			'<code>&lt;style&gt;</code>',
 			'<code>wp_add_inline_style()</code>'
-		), '3.7.0' );
-		$data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $data ) );
+		), '3.7.0');
+		$data = trim(preg_replace('#<style[^>]*>(.*)</style>#is', '$1', $data));
 	}
 
-	return wp_styles()->add_inline_style( $handle, $data );
+	return wp_styles()->add_inline_style($handle, $data);
 }
 
 /**
@@ -117,10 +117,10 @@ 
  *                                 '(orientation: portrait)' and '(max-width: 640px)'.
  * @return bool Whether the style has been registered. True on success, false on failure.
  */
-function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_register_style($handle, $src, $deps = array(), $ver = false, $media = 'all') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return wp_styles()->add( $handle, $src, $deps, $ver, $media );
+	return wp_styles()->add($handle, $src, $deps, $ver, $media);
 }
 
 /**
@@ -132,10 +132,10 @@ 
  *
  * @param string $handle Name of the stylesheet to be removed.
  */
-function wp_deregister_style( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_deregister_style($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_styles()->remove( $handle );
+	wp_styles()->remove($handle);
 }
 
 /**
@@ -161,16 +161,16 @@ 
  *                                 Default 'all'. Accepts media types like 'all', 'print' and 'screen', or media queries like
  *                                 '(orientation: portrait)' and '(max-width: 640px)'.
  */
-function wp_enqueue_style( $handle, $src = '', $deps = array(), $ver = false, $media = 'all' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_enqueue_style($handle, $src = '', $deps = array(), $ver = false, $media = 'all') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	$wp_styles = wp_styles();
 
-	if ( $src ) {
+	if ($src) {
 		$_handle = explode('?', $handle);
-		$wp_styles->add( $_handle[0], $src, $deps, $ver, $media );
+		$wp_styles->add($_handle[0], $src, $deps, $ver, $media);
 	}
-	$wp_styles->enqueue( $handle );
+	$wp_styles->enqueue($handle);
 }
 
 /**
@@ -182,10 +182,10 @@ 
  *
  * @param string $handle Name of the stylesheet to be removed.
  */
-function wp_dequeue_style( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_dequeue_style($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_styles()->dequeue( $handle );
+	wp_styles()->dequeue($handle);
 }
 
 /**
@@ -198,10 +198,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether style is queued.
  */
-function wp_style_is( $handle, $list = 'enqueued' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_style_is($handle, $list = 'enqueued') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return (bool) wp_styles()->query( $handle, $list );
+	return (bool) wp_styles()->query($handle, $list);
 }
 
 /**
@@ -226,6 +226,6 @@ 
  * @param mixed  $value  String containing the CSS data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_style_add_data( $handle, $key, $value ) {
-	return wp_styles()->add_data( $handle, $key, $value );
+function wp_style_add_data($handle, $key, $value) {
+	return wp_styles()->add_data($handle, $key, $value);
 }

src/wp-includes/locale.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
  * @since 1.2.0
  */
 
-_deprecated_file( basename( __FILE__ ), '4.7.0' );
+_deprecated_file(basename(__FILE__), '4.7.0');

src/wp-includes/ms-deprecated.php

Indentation +5 added lines, -5 removed lines

@@ -24,12 +24,12 @@
  * @return WP_Site Current site object.
  */
 function get_dashboard_blog() {
-    _deprecated_function( __FUNCTION__, '3.1.0' );
-    if ( $blog = get_site_option( 'dashboard_blog' ) ) {
-	    return get_site( $blog );
-    }
+	_deprecated_function( __FUNCTION__, '3.1.0' );
+	if ( $blog = get_site_option( 'dashboard_blog' ) ) {
+		return get_site( $blog );
+	}
 
-    return get_site( get_network()->site_id );
+	return get_site( get_network()->site_id );
 }
 
 /**

Spacing +120 added lines, -120 removed lines

@@ -24,12 +24,12 @@ 
  * @return WP_Site Current site object.
  */
 function get_dashboard_blog() {
-    _deprecated_function( __FUNCTION__, '3.1.0' );
-    if ( $blog = get_site_option( 'dashboard_blog' ) ) {
-	    return get_site( $blog );
+    _deprecated_function(__FUNCTION__, '3.1.0');
+    if ($blog = get_site_option('dashboard_blog')) {
+	    return get_site($blog);
     }
 
-    return get_site( get_network()->site_id );
+    return get_site(get_network()->site_id);
 }
 
 /**
@@ -41,9 +41,9 @@ 
  *
  * @param int $len Optional. The length of password to generate. Default 8.
  */
-function generate_random_password( $len = 8 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_generate_password()' );
-	return wp_generate_password( $len );
+function generate_random_password($len = 8) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_generate_password()');
+	return wp_generate_password($len);
 }
 
 /**
@@ -61,24 +61,24 @@ 
  *
  * @param string $user_login Optional. Username for the user to check. Default empty.
  */
-function is_site_admin( $user_login = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_super_admin()' );
+function is_site_admin($user_login = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_super_admin()');
 
-	if ( empty( $user_login ) ) {
+	if (empty($user_login)) {
 		$user_id = get_current_user_id();
-		if ( !$user_id )
+		if ( ! $user_id)
 			return false;
 	} else {
-		$user = get_user_by( 'login', $user_login );
-		if ( ! $user->exists() )
+		$user = get_user_by('login', $user_login);
+		if ( ! $user->exists())
 			return false;
 		$user_id = $user->ID;
 	}
 
-	return is_super_admin( $user_id );
+	return is_super_admin($user_id);
 }
 
-if ( !function_exists( 'graceful_fail' ) ) :
+if ( ! function_exists('graceful_fail')) :
 /**
  * Deprecated functionality to gracefully fail.
  *
@@ -86,10 +86,10 @@ 
  * @deprecated 3.0.0 Use wp_die()
  * @see wp_die()
  */
-function graceful_fail( $message ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_die()' );
-	$message = apply_filters( 'graceful_fail', $message );
-	$message_template = apply_filters( 'graceful_fail_template',
+function graceful_fail($message) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_die()');
+	$message = apply_filters('graceful_fail', $message);
+	$message_template = apply_filters('graceful_fail_template',
 '<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"><head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -113,7 +113,7 @@ 
 <p class="message">%s</p>
 </body>
 </html>' );
-	die( sprintf( $message_template, $message ) );
+	die(sprintf($message_template, $message));
 }
 endif;
 
@@ -126,8 +126,8 @@ 
  *
  * @param string $username Username.
  */
-function get_user_details( $username ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_user_by()' );
+function get_user_details($username) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_user_by()');
 	return get_user_by('login', $username);
 }
 
@@ -140,8 +140,8 @@ 
  *
  * @param int $post_id Post ID.
  */
-function clear_global_post_cache( $post_id ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'clean_post_cache()' );
+function clear_global_post_cache($post_id) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'clean_post_cache()');
 }
 
 /**
@@ -152,7 +152,7 @@ 
  * @see is_main_site()
  */
 function is_main_blog() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_main_site()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_main_site()');
 	return is_main_site();
 }
 
@@ -167,9 +167,9 @@ 
  * @param bool   $check_domain Deprecated.
  * @return string|bool Either false or the valid email address.
  */
-function validate_email( $email, $check_domain = true) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'is_email()' );
-	return is_email( $email, $check_domain );
+function validate_email($email, $check_domain = true) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_email()');
+	return is_email($email, $check_domain);
 }
 
 /**
@@ -183,26 +183,26 @@ 
  * @param int    $num        Optional. Number of blogs to list. Default 10.
  * @param string $deprecated Unused.
  */
-function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_get_sites()' );
+function get_blog_list($start = 0, $num = 10, $deprecated = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_get_sites()');
 
 	global $wpdb;
-	$blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
+	$blogs = $wpdb->get_results($wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A);
 
 	$blog_list = array();
-	foreach ( (array) $blogs as $details ) {
-		$blog_list[ $details['blog_id'] ] = $details;
-		$blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->get_blog_prefix( $details['blog_id'] ). "posts WHERE post_status='publish' AND post_type='post'" );
+	foreach ((array) $blogs as $details) {
+		$blog_list[$details['blog_id']] = $details;
+		$blog_list[$details['blog_id']]['postcount'] = $wpdb->get_var("SELECT COUNT(ID) FROM ".$wpdb->get_blog_prefix($details['blog_id'])."posts WHERE post_status='publish' AND post_type='post'");
 	}
 
-	if ( ! $blog_list ) {
+	if ( ! $blog_list) {
 		return array();
 	}
 
-	if ( $num == 'all' ) {
-		return array_slice( $blog_list, $start, count( $blog_list ) );
+	if ($num == 'all') {
+		return array_slice($blog_list, $start, count($blog_list));
 	} else {
-		return array_slice( $blog_list, $start, $num );
+		return array_slice($blog_list, $start, $num);
 	}
 }
 
@@ -216,38 +216,38 @@ 
  * @param bool $display Optional. Whether or not to display the most active blogs list. Default true.
  * @return array List of "most active" sites.
  */
-function get_most_active_blogs( $num = 10, $display = true ) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+function get_most_active_blogs($num = 10, $display = true) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 
-	$blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
-	if ( is_array( $blogs ) ) {
-		reset( $blogs );
+	$blogs = get_blog_list(0, 'all', false); // $blog_id -> $details
+	if (is_array($blogs)) {
+		reset($blogs);
 		$most_active = array();
 		$blog_list = array();
-		foreach ( (array) $blogs as $key => $details ) {
-			$most_active[ $details['blog_id'] ] = $details['postcount'];
-			$blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
+		foreach ((array) $blogs as $key => $details) {
+			$most_active[$details['blog_id']] = $details['postcount'];
+			$blog_list[$details['blog_id']] = $details; // array_slice() removes keys!!
 		}
-		arsort( $most_active );
-		reset( $most_active );
+		arsort($most_active);
+		reset($most_active);
 		$t = array();
-		foreach ( (array) $most_active as $key => $details ) {
-			$t[ $key ] = $blog_list[ $key ];
+		foreach ((array) $most_active as $key => $details) {
+			$t[$key] = $blog_list[$key];
 		}
-		unset( $most_active );
+		unset($most_active);
 		$most_active = $t;
 	}
 
-	if ( $display ) {
-		if ( is_array( $most_active ) ) {
-			reset( $most_active );
-			foreach ( (array) $most_active as $key => $details ) {
-				$url = esc_url('http://' . $details['domain'] . $details['path']);
-				echo '<li>' . $details['postcount'] . " <a href='$url'>$url</a></li>";
+	if ($display) {
+		if (is_array($most_active)) {
+			reset($most_active);
+			foreach ((array) $most_active as $key => $details) {
+				$url = esc_url('http://'.$details['domain'].$details['path']);
+				echo '<li>'.$details['postcount']." <a href='$url'>$url</a></li>";
 			}
 		}
 	}
-	return array_slice( $most_active, 0, $num );
+	return array_slice($most_active, 0, $num);
 }
 
 /**
@@ -267,33 +267,33 @@ 
  *
  * @param string $url Optional. Redirect URL. Default empty.
  */
-function wpmu_admin_do_redirect( $url = '' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function wpmu_admin_do_redirect($url = '') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$ref = '';
-	if ( isset( $_GET['ref'] ) )
+	if (isset($_GET['ref']))
 		$ref = $_GET['ref'];
-	if ( isset( $_POST['ref'] ) )
+	if (isset($_POST['ref']))
 		$ref = $_POST['ref'];
 
-	if ( $ref ) {
-		$ref = wpmu_admin_redirect_add_updated_param( $ref );
-		wp_redirect( $ref );
+	if ($ref) {
+		$ref = wpmu_admin_redirect_add_updated_param($ref);
+		wp_redirect($ref);
 		exit();
 	}
-	if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
-		wp_redirect( $_SERVER['HTTP_REFERER'] );
+	if ( ! empty($_SERVER['HTTP_REFERER'])) {
+		wp_redirect($_SERVER['HTTP_REFERER']);
 		exit();
 	}
 
-	$url = wpmu_admin_redirect_add_updated_param( $url );
-	if ( isset( $_GET['redirect'] ) ) {
-		if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
-			$url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
-	} elseif ( isset( $_POST['redirect'] ) ) {
-		$url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
+	$url = wpmu_admin_redirect_add_updated_param($url);
+	if (isset($_GET['redirect'])) {
+		if (substr($_GET['redirect'], 0, 2) == 's_')
+			$url .= '&action=blogs&s='.esc_html(substr($_GET['redirect'], 2));
+	} elseif (isset($_POST['redirect'])) {
+		$url = wpmu_admin_redirect_add_updated_param($_POST['redirect']);
 	}
-	wp_redirect( $url );
+	wp_redirect($url);
 	exit();
 }
 
@@ -307,14 +307,14 @@ 
  * @param string $url Optional. Redirect URL. Default empty.
  * @return string
  */
-function wpmu_admin_redirect_add_updated_param( $url = '' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function wpmu_admin_redirect_add_updated_param($url = '') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( strpos( $url, 'updated=true' ) === false ) {
-		if ( strpos( $url, '?' ) === false )
-			return $url . '?updated=true';
+	if (strpos($url, 'updated=true') === false) {
+		if (strpos($url, '?') === false)
+			return $url.'?updated=true';
 		else
-			return $url . '&updated=true';
+			return $url.'&updated=true';
 	}
 	return $url;
 }
@@ -332,17 +332,17 @@ 
  * @param string $string Either an email address or a login.
  * @return int
  */
-function get_user_id_from_string( $string ) {
-	_deprecated_function( __FUNCTION__, '3.6.0', 'get_user_by()' );
+function get_user_id_from_string($string) {
+	_deprecated_function(__FUNCTION__, '3.6.0', 'get_user_by()');
 
-	if ( is_email( $string ) )
-		$user = get_user_by( 'email', $string );
-	elseif ( is_numeric( $string ) )
+	if (is_email($string))
+		$user = get_user_by('email', $string);
+	elseif (is_numeric($string))
 		return $string;
 	else
-		$user = get_user_by( 'login', $string );
+		$user = get_user_by('login', $string);
 
-	if ( $user )
+	if ($user)
 		return $user->ID;
 	return 0;
 }
@@ -357,23 +357,23 @@ 
  * @param string $path
  * @return string
  */
-function get_blogaddress_by_domain( $domain, $path ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
+function get_blogaddress_by_domain($domain, $path) {
+	_deprecated_function(__FUNCTION__, '3.7.0');
 
-	if ( is_subdomain_install() ) {
-		$url = "http://" . $domain.$path;
+	if (is_subdomain_install()) {
+		$url = "http://".$domain.$path;
 	} else {
-		if ( $domain != $_SERVER['HTTP_HOST'] ) {
-			$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
-			$url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
+		if ($domain != $_SERVER['HTTP_HOST']) {
+			$blogname = substr($domain, 0, strpos($domain, '.'));
+			$url = 'http://'.substr($domain, strpos($domain, '.') + 1).$path;
 			// we're not installing the main blog
-			if ( $blogname != 'www.' )
-				$url .= $blogname . '/';
+			if ($blogname != 'www.')
+				$url .= $blogname.'/';
 		} else { // main blog
-			$url = 'http://' . $domain . $path;
+			$url = 'http://'.$domain.$path;
 		}
 	}
-	return esc_url_raw( $url );
+	return esc_url_raw($url);
 }
 
 /**
@@ -388,22 +388,22 @@ 
  * @param int    $site_id      Optional. Defaults to 1.
  * @return string|int The ID of the newly created blog
  */
-function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0' );
+function create_empty_blog($domain, $path, $weblog_title, $site_id = 1) {
+	_deprecated_function(__FUNCTION__, '4.4.0');
 
-	if ( empty($path) )
+	if (empty($path))
 		$path = '/';
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: Site URL already taken.' );
+	if (domain_exists($domain, $path, $site_id))
+		return __('<strong>ERROR</strong>: Site URL already taken.');
 
 	// Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
 	// Need to get blog_id from wp_blogs, and create new table names.
 	// Must restore table names at the end of function.
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: problem creating site entry.' );
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id))
+		return __('<strong>ERROR</strong>: problem creating site entry.');
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id);
@@ -424,18 +424,18 @@ 
  * @param string $path       Optional. Site path.
  * @return array|false The network admins
  */
-function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
-	_deprecated_function( __FUNCTION__, '4.4.0' );
+function get_admin_users_for_domain($sitedomain = '', $path = '') {
+	_deprecated_function(__FUNCTION__, '4.4.0');
 
 	global $wpdb;
 
-	if ( ! $sitedomain )
+	if ( ! $sitedomain)
 		$site_id = $wpdb->siteid;
 	else
-		$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
+		$site_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path));
 
-	if ( $site_id )
-		return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
+	if ($site_id)
+		return $wpdb->get_results($wpdb->prepare("SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id), ARRAY_A);
 
 	return false;
 }
@@ -467,12 +467,12 @@ 
  *               site domain and path, dates registered and modified, and the language ID. Also, boolean
  *               values for whether the site is public, archived, mature, spam, and/or deleted.
  */
-function wp_get_sites( $args = array() ) {
+function wp_get_sites($args = array()) {
 	global $wpdb;
 
-	_deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' );
+	_deprecated_function(__FUNCTION__, '4.6.0', 'get_sites()');
 
-	if ( wp_is_large_network() )
+	if (wp_is_large_network())
 		return array();
 
 	$defaults = array(
@@ -486,15 +486,15 @@ 
 		'offset'     => 0,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	// Backwards compatibility
-	if( is_array( $args['network_id'] ) ){
+	if (is_array($args['network_id'])) {
 		$args['network__in'] = $args['network_id'];
 		$args['network_id'] = null;
 	}
 
-	if( is_numeric( $args['limit'] ) ){
+	if (is_numeric($args['limit'])) {
 		$args['number'] = $args['limit'];
 		$args['limit'] = null;
 	}
@@ -502,12 +502,12 @@ 
 	// Make sure count is disabled.
 	$args['count'] = false;
 
-	$_sites  = get_sites( $args );
+	$_sites  = get_sites($args);
 
 	$results = array();
 
-	foreach ( $_sites as $_site ) {
-		$_site = get_site( $_site );
+	foreach ($_sites as $_site) {
+		$_site = get_site($_site);
 		$results[] = $_site->to_array();
 	}
 

Braces +53 added lines, -38 removed lines

@@ -66,12 +66,14 @@ 
 
 	if ( empty( $user_login ) ) {
 		$user_id = get_current_user_id();
-		if ( !$user_id )
-			return false;
+		if ( !$user_id ) {
+					return false;
+		}
 	} else {
 		$user = get_user_by( 'login', $user_login );
-		if ( ! $user->exists() )
-			return false;
+		if ( ! $user->exists() ) {
+					return false;
+		}
 		$user_id = $user->ID;
 	}
 
@@ -271,10 +273,12 @@ 
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
 	$ref = '';
-	if ( isset( $_GET['ref'] ) )
-		$ref = $_GET['ref'];
-	if ( isset( $_POST['ref'] ) )
-		$ref = $_POST['ref'];
+	if ( isset( $_GET['ref'] ) ) {
+			$ref = $_GET['ref'];
+	}
+	if ( isset( $_POST['ref'] ) ) {
+			$ref = $_POST['ref'];
+	}
 
 	if ( $ref ) {
 		$ref = wpmu_admin_redirect_add_updated_param( $ref );
@@ -288,8 +292,9 @@ 
 
 	$url = wpmu_admin_redirect_add_updated_param( $url );
 	if ( isset( $_GET['redirect'] ) ) {
-		if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
-			$url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
+		if ( substr( $_GET['redirect'], 0, 2 ) == 's_' ) {
+					$url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
+		}
 	} elseif ( isset( $_POST['redirect'] ) ) {
 		$url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
 	}
@@ -311,10 +316,11 @@ 
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
 	if ( strpos( $url, 'updated=true' ) === false ) {
-		if ( strpos( $url, '?' ) === false )
-			return $url . '?updated=true';
-		else
-			return $url . '&updated=true';
+		if ( strpos( $url, '?' ) === false ) {
+					return $url . '?updated=true';
+		} else {
+					return $url . '&updated=true';
+		}
 	}
 	return $url;
 }
@@ -335,15 +341,17 @@ 
 function get_user_id_from_string( $string ) {
 	_deprecated_function( __FUNCTION__, '3.6.0', 'get_user_by()' );
 
-	if ( is_email( $string ) )
-		$user = get_user_by( 'email', $string );
-	elseif ( is_numeric( $string ) )
-		return $string;
-	else
-		$user = get_user_by( 'login', $string );
+	if ( is_email( $string ) ) {
+			$user = get_user_by( 'email', $string );
+	} elseif ( is_numeric( $string ) ) {
+			return $string;
+	} else {
+			$user = get_user_by( 'login', $string );
+	}
 
-	if ( $user )
-		return $user->ID;
+	if ( $user ) {
+			return $user->ID;
+	}
 	return 0;
 }
 
@@ -367,8 +375,9 @@ 
 			$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
 			$url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
 			// we're not installing the main blog
-			if ( $blogname != 'www.' )
-				$url .= $blogname . '/';
+			if ( $blogname != 'www.' ) {
+							$url .= $blogname . '/';
+			}
 		} else { // main blog
 			$url = 'http://' . $domain . $path;
 		}
@@ -391,19 +400,22 @@ 
 function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
 	_deprecated_function( __FUNCTION__, '4.4.0' );
 
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: Site URL already taken.' );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return __( '<strong>ERROR</strong>: Site URL already taken.' );
+	}
 
 	// Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
 	// Need to get blog_id from wp_blogs, and create new table names.
 	// Must restore table names at the end of function.
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: problem creating site entry.' );
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return __( '<strong>ERROR</strong>: problem creating site entry.' );
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id);
@@ -429,13 +441,15 @@ 
 
 	global $wpdb;
 
-	if ( ! $sitedomain )
-		$site_id = $wpdb->siteid;
-	else
-		$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
+	if ( ! $sitedomain ) {
+			$site_id = $wpdb->siteid;
+	} else {
+			$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
+	}
 
-	if ( $site_id )
-		return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
+	if ( $site_id ) {
+			return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
+	}
 
 	return false;
 }
@@ -472,8 +486,9 @@ 
 
 	_deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' );
 
-	if ( wp_is_large_network() )
-		return array();
+	if ( wp_is_large_network() ) {
+			return array();
+	}
 
 	$defaults = array(
 		'network_id' => $wpdb->siteid,

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

Spacing +55 added lines, -55 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,18 +33,18 @@ 
  *
  * @param string $function Function name.
  */
-function _wp_scripts_maybe_doing_it_wrong( $function ) {
-	if ( did_action( 'init' ) || did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' ) || did_action( 'login_enqueue_scripts' ) ) {
+function _wp_scripts_maybe_doing_it_wrong($function) {
+	if (did_action('init') || did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts') || did_action('login_enqueue_scripts')) {
 		return;
 	}
 
-	_doing_it_wrong( $function, sprintf(
+	_doing_it_wrong($function, sprintf(
 		/* translators: 1: wp_enqueue_scripts, 2: admin_enqueue_scripts, 3: login_enqueue_scripts */
-		__( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+		__('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.0' );
+	), '3.3.0');
 }
 
 /**
@@ -63,27 +63,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);
 }
 
 /**
@@ -104,20 +104,20 @@ 
  *                         or after. Default 'after'.
  * @return bool True on success, false on failure.
  */
-function wp_add_inline_script( $handle, $data, $position = 'after' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_add_inline_script($handle, $data, $position = 'after') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	if ( false !== stripos( $data, '</script>' ) ) {
-		_doing_it_wrong( __FUNCTION__, sprintf(
+	if (false !== stripos($data, '</script>')) {
+		_doing_it_wrong(__FUNCTION__, sprintf(
 			/* translators: 1: <script>, 2: wp_add_inline_script() */
-			__( 'Do not pass %1$s tags to %2$s.' ),
+			__('Do not pass %1$s tags to %2$s.'),
 			'<code>&lt;script&gt;</code>',
 			'<code>wp_add_inline_script()</code>'
-		), '4.5.0' );
-		$data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
+		), '4.5.0');
+		$data = trim(preg_replace('#<script[^>]*>(.*)</script>#is', '$1', $data));
 	}
 
-	return wp_scripts()->add_inline_script( $handle, $data, $position );
+	return wp_scripts()->add_inline_script($handle, $data, $position);
 }
 
 /**
@@ -142,13 +142,13 @@ 
  *                                    Default 'false'.
  * @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;
@@ -182,14 +182,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);
 }
 
 /**
@@ -204,16 +204,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',
@@ -224,19 +224,19 @@ 
 			'jquery-ui-tooltip', 'jquery-ui-widget', 'underscore', 'backbone',
 		);
 
-		if ( in_array( $handle, $no ) ) {
+		if (in_array($handle, $no)) {
 			$message = sprintf(
 				/* translators: 1: script name, 2: wp_enqueue_scripts */
-				__( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
+				__('Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.'),
 				"<code>$handle</code>",
 				'<code>wp_enqueue_scripts</code>'
 			);
-			_doing_it_wrong( __FUNCTION__, $message, '3.6.0' );
+			_doing_it_wrong(__FUNCTION__, $message, '3.6.0');
 			return;
 		}
 	}
 
-	wp_scripts()->remove( $handle );
+	wp_scripts()->remove($handle);
 }
 
 /**
@@ -261,25 +261,25 @@ 
  * @param bool             $in_footer Optional. Whether to enqueue the script before </body> instead of in the <head>.
  *                                    Default 'false'.
  */
-function wp_enqueue_script( $handle, $src = '', $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_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__);
 
 
-	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);
 }
 
 /**
@@ -291,10 +291,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);
 }
 
 /**
@@ -308,10 +308,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether the 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);
 }
 
 /**
@@ -331,6 +331,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/class-IXR.php

Spacing +10 added lines, -10 removed lines

@@ -39,22 +39,22 @@
  * @license    http://www.opensource.org/licenses/bsd-license.php BSD
  */
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-server.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-server.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-base64.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-base64.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-client.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-client.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-clientmulticall.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-clientmulticall.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-date.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-date.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-error.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-error.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-introspectionserver.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-introspectionserver.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-message.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-message.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-request.php' );
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-request.php');
 
-require_once( ABSPATH . WPINC . '/IXR/class-IXR-value.php' );
\ No newline at end of file
+require_once(ABSPATH.WPINC.'/IXR/class-IXR-value.php');
\ No newline at end of file

src/wp-includes/class-wp-term.php

Spacing +34 added lines, -34 removed lines

@@ -122,74 +122,74 @@ 
 	 *                                there's insufficient data to distinguish which term is intended.
 	 *                                False for other failures.
 	 */
-	public static function get_instance( $term_id, $taxonomy = null ) {
+	public static function get_instance($term_id, $taxonomy = null) {
 		global $wpdb;
 
-		if ( ! is_numeric( $term_id ) || $term_id != floor( $term_id ) || ! $term_id ) {
+		if ( ! is_numeric($term_id) || $term_id != floor($term_id) || ! $term_id) {
 			return false;
 		}
 
 		$term_id = (int) $term_id;
 
-		$_term = wp_cache_get( $term_id, 'terms' );
+		$_term = wp_cache_get($term_id, 'terms');
 
 		// If there isn't a cached version, hit the database.
-		if ( ! $_term || ( $taxonomy && $taxonomy !== $_term->taxonomy ) ) {
+		if ( ! $_term || ($taxonomy && $taxonomy !== $_term->taxonomy)) {
 			// Grab all matching terms, in case any are shared between taxonomies.
-			$terms = $wpdb->get_results( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id = %d", $term_id ) );
-			if ( ! $terms ) {
+			$terms = $wpdb->get_results($wpdb->prepare("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id = %d", $term_id));
+			if ( ! $terms) {
 				return false;
 			}
 
 			// If a taxonomy was specified, find a match.
-			if ( $taxonomy ) {
-				foreach ( $terms as $match ) {
-					if ( $taxonomy === $match->taxonomy ) {
+			if ($taxonomy) {
+				foreach ($terms as $match) {
+					if ($taxonomy === $match->taxonomy) {
 						$_term = $match;
 						break;
 					}
 				}
 
 			// If only one match was found, it's the one we want.
-			} elseif ( 1 === count( $terms ) ) {
-				$_term = reset( $terms );
+			} elseif (1 === count($terms)) {
+				$_term = reset($terms);
 
 			// Otherwise, the term must be shared between taxonomies.
 			} else {
 				// If the term is shared only with invalid taxonomies, return the one valid term.
-				foreach ( $terms as $t ) {
-					if ( ! taxonomy_exists( $t->taxonomy ) ) {
+				foreach ($terms as $t) {
+					if ( ! taxonomy_exists($t->taxonomy)) {
 						continue;
 					}
 
 					// Only hit if we've already identified a term in a valid taxonomy.
-					if ( $_term ) {
-						return new WP_Error( 'ambiguous_term_id', __( 'Term ID is shared between multiple taxonomies' ), $term_id );
+					if ($_term) {
+						return new WP_Error('ambiguous_term_id', __('Term ID is shared between multiple taxonomies'), $term_id);
 					}
 
 					$_term = $t;
 				}
 			}
 
-			if ( ! $_term ) {
+			if ( ! $_term) {
 				return false;
 			}
 
 			// Don't return terms from invalid taxonomies.
-			if ( ! taxonomy_exists( $_term->taxonomy ) ) {
-				return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+			if ( ! taxonomy_exists($_term->taxonomy)) {
+				return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 			}
 
-			$_term = sanitize_term( $_term, $_term->taxonomy, 'raw' );
+			$_term = sanitize_term($_term, $_term->taxonomy, 'raw');
 
 			// Don't cache terms that are shared between taxonomies.
-			if ( 1 === count( $terms ) ) {
-				wp_cache_add( $term_id, $_term, 'terms' );
+			if (1 === count($terms)) {
+				wp_cache_add($term_id, $_term, 'terms');
 			}
 		}
 
-		$term_obj = new WP_Term( $_term );
-		$term_obj->filter( $term_obj->filter );
+		$term_obj = new WP_Term($_term);
+		$term_obj->filter($term_obj->filter);
 
 		return $term_obj;
 	}
@@ -202,8 +202,8 @@ 
 	 *
 	 * @param WP_Term|object $term Term object.
 	 */
-	public function __construct( $term ) {
-		foreach ( get_object_vars( $term ) as $key => $value ) {
+	public function __construct($term) {
+		foreach (get_object_vars($term) as $key => $value) {
 			$this->$key = $value;
 		}
 	}
@@ -216,8 +216,8 @@ 
 	 *
 	 * @param string $filter Filter context. Accepts 'edit', 'db', 'display', 'attribute', 'js', 'raw'.
 	 */
-	public function filter( $filter ) {
-		sanitize_term( $this, $this->taxonomy, $filter );
+	public function filter($filter) {
+		sanitize_term($this, $this->taxonomy, $filter);
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		return get_object_vars( $this );
+		return get_object_vars($this);
 	}
 
 	/**
@@ -241,16 +241,16 @@ 
 	 * @param string $key Property to get.
 	 * @return mixed Property value.
 	 */
-	public function __get( $key ) {
-		switch ( $key ) {
+	public function __get($key) {
+		switch ($key) {
 			case 'data' :
 				$data = new stdClass();
-				$columns = array( 'term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count' );
-				foreach ( $columns as $column ) {
-					$data->{$column} = isset( $this->{$column} ) ? $this->{$column} : null;
+				$columns = array('term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count');
+				foreach ($columns as $column) {
+					$data->{$column} = isset($this->{$column} ) ? $this->{$column} : null;
 				}
 
-				return sanitize_term( $data, $data->taxonomy, 'raw' );
+				return sanitize_term($data, $data->taxonomy, 'raw');
 		}
 	}
 }

src/wp-includes/nav-menu.php

Spacing +236 added lines, -236 removed lines

@@ -15,26 +15,26 @@ 
  * @param int|string|WP_Term $menu Menu ID, slug, or name - or the menu object.
  * @return WP_Term|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);
 }
 
 /**
@@ -102,13 +102,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;
 	}
@@ -123,8 +123,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));
 }
 /**
  * Retrieves all registered navigation menu locations in a theme.
@@ -137,7 +137,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();
 }
@@ -152,8 +152,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();
 }
 
 /**
@@ -164,13 +164,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]);
 	}
 
 	/**
@@ -181,7 +181,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);
 }
 
 /**
@@ -192,8 +192,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)));
 }
 
 /**
@@ -206,9 +206,9 @@ 
  * @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 ) {
+function wp_create_nav_menu($menu_name) {
 	// expected_slashed ($menu_name)
-	return wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) );
+	return wp_update_nav_menu_object(0, array('menu-name' => $menu_name));
 }
 
 /**
@@ -219,29 +219,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.
@@ -250,7 +250,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;
 }
@@ -266,51 +266,51 @@ 
  * @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()) {
 	// expected_slashed ($menu_data)
 	$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',
+		return new WP_Error('menu_exists',
 			/* translators: %s: menu name */
-			sprintf( __( 'The menu name %s conflicts with another menu name. Please try another.' ),
-				'<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>'
+			sprintf(__('The menu name %s conflicts with another menu name. Please try another.'),
+				'<strong>'.esc_html($menu_data['menu-name']).'</strong>'
 			)
 		);
 	}
 
 	// 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',
+		if ($menu_exists) {
+			return new WP_Error('menu_exists',
 				/* translators: %s: menu name */
-				sprintf( __( 'The menu name %s conflicts with another menu name. Please try another.' ),
-					'<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>'
+				sprintf(__('The menu name %s conflicts with another menu name. Please try another.'),
+					'<strong>'.esc_html($menu_data['menu-name']).'</strong>'
 				)
 			);
 		}
 
-		$_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;
 
 		/**
@@ -321,19 +321,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'];
@@ -346,7 +346,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;
 }
 
@@ -363,21 +363,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;
 	}
 
@@ -398,19 +398,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
@@ -419,26 +419,26 @@ 
 		$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;
-		} elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
-			$original_object = get_post_type_object( $args['menu-item-object'] );
-			if ( $original_object ) {
+		} elseif ('post_type_archive' == $args['menu-item-type']) {
+			$original_object = get_post_type_object($args['menu-item-object']);
+			if ($original_object) {
 				$original_title = $original_object->labels->archives;
 			}
 		}
 
-		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'] = ' ';
 	}
 
@@ -456,11 +456,11 @@ 
 	$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;
 
 		/**
@@ -474,44 +474,44 @@ 
 		 * @param int   $menu_item_db_id ID of the new menu item.
 		 * @param array $args            An array of arguments used to update/add the menu item.
 		 */
-		do_action( 'wp_add_nav_menu_item', $menu_id, $menu_item_db_id, $args );
+		do_action('wp_add_nav_menu_item', $menu_id, $menu_item_db_id, $args);
 	}
 
 	// 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);
 	}
 
 	/**
@@ -525,7 +525,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;
 }
@@ -541,9 +541,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);
 
 	/**
 	 * Filters the navigation menu objects being returned.
@@ -555,7 +555,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);
 }
 
 /**
@@ -569,8 +569,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);
 }
 
 /**
@@ -585,77 +585,77 @@ 
  * @param array  $args Optional. Arguments to pass to 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 front end
-		$items = array_filter( $items, '_is_valid_nav_menu_item' );
+	if ( ! is_admin()) { // Remove invalid items only in front end
+		$items = array_filter($items, '_is_valid_nav_menu_item');
 	}
 
-	if ( ARRAY_A == $args['output'] ) {
-		$items = wp_list_sort( $items, array(
+	if (ARRAY_A == $args['output']) {
+		$items = wp_list_sort($items, array(
 			$args['output_key'] => 'ASC',
-		) );
+		));
 		$i = 1;
-		foreach ( $items as $k => $item ) {
+		foreach ($items as $k => $item) {
 			$items[$k]->{$args['output_key']} = $i++;
 		}
 	}
@@ -669,7 +669,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);
 }
 
 /**
@@ -699,44 +699,44 @@ 
  * @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;
 				}
 
-				if ( 'trash' === get_post_status( $menu_item->object_id ) ) {
+				if ('trash' === get_post_status($menu_item->object_id)) {
 					$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);
 				/** This filter is documented in wp-includes/post-template.php */
-				$original_title = apply_filters( 'the_title', $original_object->post_title, $original_object->ID );
+				$original_title = apply_filters('the_title', $original_object->post_title, $original_object->ID);
 
-				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 ( 'post_type_archive' == $menu_item->type ) {
-				$object =  get_post_type_object( $menu_item->object );
-				if ( $object ) {
+			} elseif ('post_type_archive' == $menu_item->type) {
+				$object = get_post_type_object($menu_item->object);
+				if ($object) {
 					$menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title;
 					$post_type_description = $object->description;
 				} else {
@@ -744,34 +744,34 @@ 
 					$post_type_description = '';
 				}
 
-				$menu_item->type_label = __( 'Post Type Archive' );
-				$post_content = wp_trim_words( $menu_item->post_content, 200 );
+				$menu_item->type_label = __('Post Type Archive');
+				$post_content = wp_trim_words($menu_item->post_content, 200);
 				$post_type_description = '' == $post_content ? $post_type_description : $post_content;
-				$menu_item->url = get_post_type_archive_link( $menu_item->object );
-			} elseif ( 'taxonomy' == $menu_item->type ) {
-				$object = get_taxonomy( $menu_item->object );
-				if ( $object ) {
+				$menu_item->url = get_post_type_archive_link($menu_item->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;
 
 			/**
 			 * Filters a navigation menu item's title attribute.
@@ -780,9 +780,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)) {
 				/**
 				 * Filters a navigation menu item's description.
 				 *
@@ -790,39 +790,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;
@@ -830,15 +830,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 = '';
 
@@ -851,7 +851,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);
 }
 
 /**
@@ -864,7 +864,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();
 
@@ -878,9 +878,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
@@ -889,14 +889,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);
 }
 
 /**
@@ -908,13 +908,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);
 	}
 }
 
@@ -928,13 +928,13 @@ 
  * @param int    $tt_id     Term taxonomy ID. Unused.
  * @param string $taxonomy  Taxonomy slug.
  */
-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);
 	}
 }
 
@@ -948,16 +948,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(
@@ -967,14 +967,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 +70 added lines, -48 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;
 }
@@ -137,8 +139,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();
 }
 
@@ -221,8 +224,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 ) ) {
@@ -236,13 +240,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.
 		 *
@@ -251,6 +256,7 @@ 
 		 * @param int $term_id ID of the deleted menu.
 		 */
 		do_action( 'wp_delete_nav_menu', $menu->term_id );
+	}
 
 	return $result;
 }
@@ -310,8 +316,9 @@ 
 
 		$_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.
@@ -326,15 +333,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'];
 
@@ -368,8 +377,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 );
 
@@ -434,12 +444,14 @@ 
 			}
 		}
 
-		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
@@ -460,8 +472,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;
+		}
 
 		/**
 		 * Fires immediately after a new navigation menu item has been added.
@@ -502,10 +515,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 ) {
@@ -620,10 +634,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 ) ) {
@@ -761,8 +776,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 {
@@ -949,16 +965,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,
@@ -969,11 +989,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 );
 	}