ntwb / wordpress

src/wp-includes/SimplePie/Author.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -130,8 +129,7 @@ 
 		if ($this->link !== null)
 		{
 			return $this->link;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -147,8 +145,7 @@ 
 		if ($this->email !== null)
 		{
 			return $this->email;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Registry.php

Spacing +4 added lines, -4 removed lines

@@ -113,7 +113,7 @@ 
 	 */
 	public function register($type, $class, $legacy = false)
 	{
-		if (!is_subclass_of($class, $this->default[$type]))
+		if ( ! is_subclass_of($class, $this->default[$type]))
 		{
 			return false;
 		}
@@ -138,11 +138,11 @@ 
 	 */
 	public function get_class($type)
 	{
-		if (!empty($this->classes[$type]))
+		if ( ! empty($this->classes[$type]))
 		{
 			return $this->classes[$type];
 		}
-		if (!empty($this->default[$type]))
+		if ( ! empty($this->default[$type]))
 		{
 			return $this->default[$type];
 		}
@@ -174,7 +174,7 @@ 
 			}
 		}
 
-		if (!method_exists($class, '__construct'))
+		if ( ! method_exists($class, '__construct'))
 		{
 			$instance = new $class;
 		}

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 		if (!method_exists($class, '__construct'))
 		{
 			$instance = new $class;
-		}
-		else
+		} else
 		{
 			$reflector = new ReflectionClass($class);
 			$instance = $reflector->newInstanceArgs($parameters);

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

Braces +18 added lines, -11 removed lines

@@ -75,8 +75,9 @@ 
 	public function maybe_run_ajax_cache() {
 		$post = get_post();
 
-		if ( ! $post || empty( $_GET['message'] ) )
-			return;
+		if ( ! $post || empty( $_GET['message'] ) ) {
+					return;
+		}
 
 ?>
 <script type="text/javascript">
@@ -157,8 +158,8 @@ 
 		foreach ( $this->handlers as $priority => $handlers ) {
 			foreach ( $handlers as $id => $handler ) {
 				if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
-					if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
-						/**
+					if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) ) {
+											/**
 						 * Filter the returned embed handler.
 						 *
 						 * @since 2.9.0
@@ -170,13 +171,16 @@ 
 						 * @param array  $attr   An array of shortcode attributes.
 						 */
 						return apply_filters( 'embed_handler_html', $return, $url, $attr );
+					}
 				}
 			}
 		}
 
 		$post_ID = ( ! empty( $post->ID ) ) ? $post->ID : null;
-		if ( ! empty( $this->post_ID ) ) // Potentially set by WP_Embed::cache_oembed()
+		if ( ! empty( $this->post_ID ) ) {
+			// Potentially set by WP_Embed::cache_oembed()
 			$post_ID = $this->post_ID;
+		}
 
 		// Unknown URL format. Let oEmbed have a go.
 		if ( $post_ID ) {
@@ -209,8 +213,9 @@ 
 
 			if ( $this->usecache || $cached_recently ) {
 				// Failures are cached. Serve one if we're using the cache.
-				if ( '{{unknown}}' === $cache )
-					return $this->maybe_make_link( $url );
+				if ( '{{unknown}}' === $cache ) {
+									return $this->maybe_make_link( $url );
+				}
 
 				if ( ! empty( $cache ) ) {
 					/**
@@ -269,12 +274,14 @@ 
 	 */
 	public function delete_oembed_caches( $post_ID ) {
 		$post_metas = get_post_custom_keys( $post_ID );
-		if ( empty($post_metas) )
-			return;
+		if ( empty($post_metas) ) {
+					return;
+		}
 
 		foreach( $post_metas as $post_meta_key ) {
-			if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
-				delete_post_meta( $post_ID, $post_meta_key );
+			if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) ) {
+							delete_post_meta( $post_ID, $post_meta_key );
+			}
 		}
 	}
 

Spacing +76 added lines, -76 removed lines

@@ -30,17 +30,17 @@ 
 	 */
 	public function __construct() {
 		// Hack to get the [embed] shortcode to run before wpautop()
-		add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
+		add_filter('the_content', array($this, 'run_shortcode'), 8);
 
 		// Shortcode placeholder for strip_shortcodes()
-		add_shortcode( 'embed', '__return_false' );
+		add_shortcode('embed', '__return_false');
 
 		// Attempts to embed all URLs in a post
-		add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
+		add_filter('the_content', array($this, 'autoembed'), 8);
 
 		// After a post is saved, cache oEmbed items via AJAX
-		add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
-		add_action( 'edit_page_form', array( $this, 'maybe_run_ajax_cache' ) );
+		add_action('edit_form_advanced', array($this, 'maybe_run_ajax_cache'));
+		add_action('edit_page_form', array($this, 'maybe_run_ajax_cache'));
 	}
 
 	/**
@@ -55,17 +55,17 @@ 
 	 * @param string $content Content to parse
 	 * @return string Content with shortcode parsed
 	 */
-	public function run_shortcode( $content ) {
+	public function run_shortcode($content) {
 		global $shortcode_tags;
 
 		// Back up current registered shortcodes and clear them all out
 		$orig_shortcode_tags = $shortcode_tags;
 		remove_all_shortcodes();
 
-		add_shortcode( 'embed', array( $this, 'shortcode' ) );
+		add_shortcode('embed', array($this, 'shortcode'));
 
 		// Do the shortcode (only the [embed] one is registered)
-		$content = do_shortcode( $content, true );
+		$content = do_shortcode($content, true);
 
 		// Put the original shortcodes back
 		$shortcode_tags = $orig_shortcode_tags;
@@ -80,13 +80,13 @@ 
 	public function maybe_run_ajax_cache() {
 		$post = get_post();
 
-		if ( ! $post || empty( $_GET['message'] ) )
+		if ( ! $post || empty($_GET['message']))
 			return;
 
 ?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
-		$.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
+		$.get("<?php echo admin_url('admin-ajax.php?action=oembed-cache&post='.$post->ID, 'relative'); ?>");
 	});
 </script>
 <?php
@@ -104,7 +104,7 @@ 
 	 * @param callable $callback The callback function that will be called if the regex is matched.
 	 * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
 	 */
-	public function register_handler( $id, $regex, $callback, $priority = 10 ) {
+	public function register_handler($id, $regex, $callback, $priority = 10) {
 		$this->handlers[$priority][$id] = array(
 			'regex'    => $regex,
 			'callback' => $callback,
@@ -119,8 +119,8 @@ 
 	 * @param string $id The handler ID that should be removed.
 	 * @param int $priority Optional. The priority of the handler to be removed (default: 10).
 	 */
-	public function unregister_handler( $id, $priority = 10 ) {
-		unset( $this->handlers[ $priority ][ $id ] );
+	public function unregister_handler($id, $priority = 10) {
+		unset($this->handlers[$priority][$id]);
 	}
 
 	/**
@@ -140,35 +140,35 @@ 
 	 * @return string|false The embed HTML on success, otherwise the original URL.
 	 *                      `->maybe_make_link()` can return false on failure.
 	 */
-	public function shortcode( $attr, $url = '' ) {
+	public function shortcode($attr, $url = '') {
 		$post = get_post();
 
-		if ( empty( $url ) && ! empty( $attr['src'] ) ) {
+		if (empty($url) && ! empty($attr['src'])) {
 			$url = $attr['src'];
 		}
 
 		$this->last_url = $url;
 
-		if ( empty( $url ) ) {
+		if (empty($url)) {
 			$this->last_attr = $attr;
 			return '';
 		}
 
 		$rawattr = $attr;
-		$attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
+		$attr = wp_parse_args($attr, wp_embed_defaults($url));
 
 		$this->last_attr = $attr;
 
 		// kses converts & into &amp; and we need to undo this
 		// See https://core.trac.wordpress.org/ticket/11311
-		$url = str_replace( '&amp;', '&', $url );
+		$url = str_replace('&amp;', '&', $url);
 
 		// Look for known internal handlers
-		ksort( $this->handlers );
-		foreach ( $this->handlers as $priority => $handlers ) {
-			foreach ( $handlers as $id => $handler ) {
-				if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
-					if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
+		ksort($this->handlers);
+		foreach ($this->handlers as $priority => $handlers) {
+			foreach ($handlers as $id => $handler) {
+				if (preg_match($handler['regex'], $url, $matches) && is_callable($handler['callback'])) {
+					if (false !== $return = call_user_func($handler['callback'], $matches, $attr, $url, $rawattr))
 						/**
 						 * Filters the returned embed handler.
 						 *
@@ -180,22 +180,22 @@ 
 						 * @param string $url    The attempted embed URL.
 						 * @param array  $attr   An array of shortcode attributes.
 						 */
-						return apply_filters( 'embed_handler_html', $return, $url, $attr );
+						return apply_filters('embed_handler_html', $return, $url, $attr);
 				}
 			}
 		}
 
-		$post_ID = ( ! empty( $post->ID ) ) ? $post->ID : null;
-		if ( ! empty( $this->post_ID ) ) // Potentially set by WP_Embed::cache_oembed()
+		$post_ID = ( ! empty($post->ID)) ? $post->ID : null;
+		if ( ! empty($this->post_ID)) // Potentially set by WP_Embed::cache_oembed()
 			$post_ID = $this->post_ID;
 
 		// Unknown URL format. Let oEmbed have a go.
-		if ( $post_ID ) {
+		if ($post_ID) {
 
 			// Check for a cached result (stored in the post meta)
-			$key_suffix = md5( $url . serialize( $attr ) );
-			$cachekey = '_oembed_' . $key_suffix;
-			$cachekey_time = '_oembed_time_' . $key_suffix;
+			$key_suffix = md5($url.serialize($attr));
+			$cachekey = '_oembed_'.$key_suffix;
+			$cachekey_time = '_oembed_time_'.$key_suffix;
 
 			/**
 			 * Filters the oEmbed TTL value (time to live).
@@ -207,23 +207,23 @@ 
 			 * @param array  $attr    An array of shortcode attributes.
 			 * @param int    $post_ID Post ID.
 			 */
-			$ttl = apply_filters( 'oembed_ttl', DAY_IN_SECONDS, $url, $attr, $post_ID );
+			$ttl = apply_filters('oembed_ttl', DAY_IN_SECONDS, $url, $attr, $post_ID);
 
-			$cache = get_post_meta( $post_ID, $cachekey, true );
-			$cache_time = get_post_meta( $post_ID, $cachekey_time, true );
+			$cache = get_post_meta($post_ID, $cachekey, true);
+			$cache_time = get_post_meta($post_ID, $cachekey_time, true);
 
-			if ( ! $cache_time ) {
+			if ( ! $cache_time) {
 				$cache_time = 0;
 			}
 
-			$cached_recently = ( time() - $cache_time ) < $ttl;
+			$cached_recently = (time() - $cache_time) < $ttl;
 
-			if ( $this->usecache || $cached_recently ) {
+			if ($this->usecache || $cached_recently) {
 				// Failures are cached. Serve one if we're using the cache.
-				if ( '{{unknown}}' === $cache )
-					return $this->maybe_make_link( $url );
+				if ('{{unknown}}' === $cache)
+					return $this->maybe_make_link($url);
 
-				if ( ! empty( $cache ) ) {
+				if ( ! empty($cache)) {
 					/**
 					 * Filters the cached oEmbed HTML.
 					 *
@@ -236,7 +236,7 @@ 
 					 * @param array  $attr    An array of shortcode attributes.
 					 * @param int    $post_ID Post ID.
 					 */
-					return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
+					return apply_filters('embed_oembed_html', $cache, $url, $attr, $post_ID);
 				}
 			}
 
@@ -250,28 +250,28 @@ 
 			 *
 			 * @param bool $enable Whether to enable `<link>` tag discovery. Default true.
 			 */
-			$attr['discover'] = ( apply_filters( 'embed_oembed_discover', true ) );
+			$attr['discover'] = (apply_filters('embed_oembed_discover', true));
 
 			// Use oEmbed to get the HTML
-			$html = wp_oembed_get( $url, $attr );
+			$html = wp_oembed_get($url, $attr);
 
 			// Maybe cache the result
-			if ( $html ) {
-				update_post_meta( $post_ID, $cachekey, $html );
-				update_post_meta( $post_ID, $cachekey_time, time() );
-			} elseif ( ! $cache ) {
-				update_post_meta( $post_ID, $cachekey, '{{unknown}}' );
+			if ($html) {
+				update_post_meta($post_ID, $cachekey, $html);
+				update_post_meta($post_ID, $cachekey_time, time());
+			} elseif ( ! $cache) {
+				update_post_meta($post_ID, $cachekey, '{{unknown}}');
 			}
 
 			// If there was a result, return it
-			if ( $html ) {
+			if ($html) {
 				/** This filter is documented in wp-includes/class-wp-embed.php */
-				return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
+				return apply_filters('embed_oembed_html', $html, $url, $attr, $post_ID);
 			}
 		}
 
 		// Still unknown
-		return $this->maybe_make_link( $url );
+		return $this->maybe_make_link($url);
 	}
 
 	/**
@@ -279,14 +279,14 @@ 
 	 *
 	 * @param int $post_ID Post ID to delete the caches for.
 	 */
-	public function delete_oembed_caches( $post_ID ) {
-		$post_metas = get_post_custom_keys( $post_ID );
-		if ( empty($post_metas) )
+	public function delete_oembed_caches($post_ID) {
+		$post_metas = get_post_custom_keys($post_ID);
+		if (empty($post_metas))
 			return;
 
-		foreach ( $post_metas as $post_meta_key ) {
-			if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
-				delete_post_meta( $post_ID, $post_meta_key );
+		foreach ($post_metas as $post_meta_key) {
+			if ('_oembed_' == substr($post_meta_key, 0, 8))
+				delete_post_meta($post_ID, $post_meta_key);
 		}
 	}
 
@@ -295,10 +295,10 @@ 
 	 *
 	 * @param int $post_ID Post ID to do the caching for.
 	 */
-	public function cache_oembed( $post_ID ) {
-		$post = get_post( $post_ID );
+	public function cache_oembed($post_ID) {
+		$post = get_post($post_ID);
 
-		$post_types = get_post_types( array( 'show_ui' => true ) );
+		$post_types = get_post_types(array('show_ui' => true));
 		/**
 		 * Filters the array of post types to cache oEmbed results for.
 		 *
@@ -306,17 +306,17 @@ 
 		 *
 		 * @param array $post_types Array of post types to cache oEmbed results for. Defaults to post types with `show_ui` set to true.
 		 */
-		if ( empty( $post->ID ) || ! in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', $post_types ) ) ){
+		if (empty($post->ID) || ! in_array($post->post_type, apply_filters('embed_cache_oembed_types', $post_types))) {
 			return;
 		}
 
 		// Trigger a caching
-		if ( ! empty( $post->post_content ) ) {
+		if ( ! empty($post->post_content)) {
 			$this->post_ID = $post->ID;
 			$this->usecache = false;
 
-			$content = $this->run_shortcode( $post->post_content );
-			$this->autoembed( $content );
+			$content = $this->run_shortcode($post->post_content);
+			$this->autoembed($content);
 
 			$this->usecache = true;
 		}
@@ -330,19 +330,19 @@ 
 	 * @param string $content The content to be searched.
 	 * @return string Potentially modified $content.
 	 */
-	public function autoembed( $content ) {
+	public function autoembed($content) {
 		// Replace line breaks from all HTML elements with placeholders.
-		$content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
+		$content = wp_replace_in_html_tags($content, array("\n" => '<!-- wp-line-break -->'));
 
-		if ( preg_match( '#(^|\s|>)https?://#i', $content ) ) {
+		if (preg_match('#(^|\s|>)https?://#i', $content)) {
 			// Find URLs on their own line.
-			$content = preg_replace_callback( '|^(\s*)(https?://[^\s<>"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+			$content = preg_replace_callback('|^(\s*)(https?://[^\s<>"]+)(\s*)$|im', array($this, 'autoembed_callback'), $content);
 			// Find URLs in their own paragraph.
-			$content = preg_replace_callback( '|(<p(?: [^>]*)?>\s*)(https?://[^\s<>"]+)(\s*<\/p>)|i', array( $this, 'autoembed_callback' ), $content );
+			$content = preg_replace_callback('|(<p(?: [^>]*)?>\s*)(https?://[^\s<>"]+)(\s*<\/p>)|i', array($this, 'autoembed_callback'), $content);
 		}
 
 		// Put the line breaks back.
-		return str_replace( '<!-- wp-line-break -->', "\n", $content );
+		return str_replace('<!-- wp-line-break -->', "\n", $content);
 	}
 
 	/**
@@ -351,13 +351,13 @@ 
 	 * @param array $match A regex match array.
 	 * @return string The embed HTML on success, otherwise the original URL.
 	 */
-	public function autoembed_callback( $match ) {
+	public function autoembed_callback($match) {
 		$oldval = $this->linkifunknown;
 		$this->linkifunknown = false;
-		$return = $this->shortcode( array(), $match[2] );
+		$return = $this->shortcode(array(), $match[2]);
 		$this->linkifunknown = $oldval;
 
-		return $match[1] . $return . $match[3];
+		return $match[1].$return.$match[3];
 	}
 
 	/**
@@ -366,12 +366,12 @@ 
 	 * @param string $url URL to potentially be linked.
 	 * @return false|string Linked URL or the original URL. False if 'return_false_on_fail' is true.
 	 */
-	public function maybe_make_link( $url ) {
-		if ( $this->return_false_on_fail ) {
+	public function maybe_make_link($url) {
+		if ($this->return_false_on_fail) {
 			return false;
 		}
 
-		$output = ( $this->linkifunknown ) ? '<a href="' . esc_url($url) . '">' . esc_html($url) . '</a>' : $url;
+		$output = ($this->linkifunknown) ? '<a href="'.esc_url($url).'">'.esc_html($url).'</a>' : $url;
 
 		/**
 		 * Filters the returned, maybe-linked embed URL.
@@ -381,7 +381,7 @@ 
 		 * @param string $output The linked or original URL.
 		 * @param string $url    The original URL.
 		 */
-		return apply_filters( 'embed_maybe_make_link', $output, $url );
+		return apply_filters('embed_maybe_make_link', $output, $url);
 	}
 }
 $GLOBALS['wp_embed'] = new WP_Embed();

src/wp-includes/bookmark-template.php

Spacing +61 added lines, -61 removed lines

@@ -48,7 +48,7 @@ 
  * }
  * @return string Formatted output in HTML
  */
-function _walk_bookmarks( $bookmarks, $args = '' ) {
+function _walk_bookmarks($bookmarks, $args = '') {
 	$defaults = array(
 		'show_updated' => 0, 'show_description' => 0,
 		'show_images' => 1, 'show_name' => 0,
@@ -56,63 +56,63 @@ 
 		'show_rating' => 0, 'link_before' => '', 'link_after' => ''
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$output = ''; // Blank string to start with.
 
-	foreach ( (array) $bookmarks as $bookmark ) {
-		if ( ! isset( $bookmark->recently_updated ) ) {
+	foreach ((array) $bookmarks as $bookmark) {
+		if ( ! isset($bookmark->recently_updated)) {
 			$bookmark->recently_updated = false;
 		}
 		$output .= $r['before'];
-		if ( $r['show_updated'] && $bookmark->recently_updated ) {
+		if ($r['show_updated'] && $bookmark->recently_updated) {
 			$output .= '<em>';
 		}
 		$the_link = '#';
-		if ( ! empty( $bookmark->link_url ) ) {
-			$the_link = esc_url( $bookmark->link_url );
+		if ( ! empty($bookmark->link_url)) {
+			$the_link = esc_url($bookmark->link_url);
 		}
-		$desc = esc_attr( sanitize_bookmark_field( 'link_description', $bookmark->link_description, $bookmark->link_id, 'display' ) );
-		$name = esc_attr( sanitize_bookmark_field( 'link_name', $bookmark->link_name, $bookmark->link_id, 'display' ) );
+		$desc = esc_attr(sanitize_bookmark_field('link_description', $bookmark->link_description, $bookmark->link_id, 'display'));
+		$name = esc_attr(sanitize_bookmark_field('link_name', $bookmark->link_name, $bookmark->link_id, 'display'));
  		$title = $desc;
 
-		if ( $r['show_updated'] ) {
-			if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
+		if ($r['show_updated']) {
+			if ('00' != substr($bookmark->link_updated_f, 0, 2)) {
 				$title .= ' (';
 				$title .= sprintf(
 					__('Last updated: %s'),
 					date(
-						get_option( 'links_updated_date_format' ),
-						$bookmark->link_updated_f + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS )
+						get_option('links_updated_date_format'),
+						$bookmark->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)
 					)
 				);
 				$title .= ')';
 			}
 		}
-		$alt = ' alt="' . $name . ( $r['show_description'] ? ' ' . $title : '' ) . '"';
+		$alt = ' alt="'.$name.($r['show_description'] ? ' '.$title : '').'"';
 
-		if ( '' != $title ) {
-			$title = ' title="' . $title . '"';
+		if ('' != $title) {
+			$title = ' title="'.$title.'"';
 		}
 		$rel = $bookmark->link_rel;
-		if ( '' != $rel ) {
-			$rel = ' rel="' . esc_attr($rel) . '"';
+		if ('' != $rel) {
+			$rel = ' rel="'.esc_attr($rel).'"';
 		}
 		$target = $bookmark->link_target;
-		if ( '' != $target ) {
-			$target = ' target="' . $target . '"';
+		if ('' != $target) {
+			$target = ' target="'.$target.'"';
 		}
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
 		$output .= $r['link_before'];
 
-		if ( $bookmark->link_image != null && $r['show_images'] ) {
-			if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
+		if ($bookmark->link_image != null && $r['show_images']) {
+			if (strpos($bookmark->link_image, 'http') === 0) {
 				$output .= "<img src=\"$bookmark->link_image\" $alt $title />";
 			} else { // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$bookmark->link_image\" $alt $title />";
 			}
-			if ( $r['show_name'] ) {
+			if ($r['show_name']) {
 				$output .= " $name";
 			}
 		} else {
@@ -123,23 +123,23 @@ 
 
 		$output .= '</a>';
 
-		if ( $r['show_updated'] && $bookmark->recently_updated ) {
+		if ($r['show_updated'] && $bookmark->recently_updated) {
 			$output .= '</em>';
 		}
 
-		if ( $r['show_description'] && '' != $desc ) {
-			$output .= $r['between'] . $desc;
+		if ($r['show_description'] && '' != $desc) {
+			$output .= $r['between'].$desc;
 		}
 
-		if ( $r['show_rating'] ) {
-			$output .= $r['between'] . sanitize_bookmark_field(
+		if ($r['show_rating']) {
+			$output .= $r['between'].sanitize_bookmark_field(
 				'link_rating',
 				$bookmark->link_rating,
 				$bookmark->link_id,
 				'display'
 			);
 		}
-		$output .= $r['after'] . "\n";
+		$output .= $r['after']."\n";
 	} // end while
 
 	return $output;
@@ -197,7 +197,7 @@ 
  * }
  * @return string|void Will only return if echo option is set to not echo. Default is not return anything.
  */
-function wp_list_bookmarks( $args = '' ) {
+function wp_list_bookmarks($args = '') {
 	$defaults = array(
 		'orderby' => 'name', 'order' => 'ASC',
 		'limit' => -1, 'category' => '', 'exclude_category' => '',
@@ -210,41 +210,41 @@ 
 		'category_after' => '</li>'
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$output = '';
 
-	if ( ! is_array( $r['class'] ) ) {
-		$r['class'] = explode( ' ', $r['class'] );
+	if ( ! is_array($r['class'])) {
+		$r['class'] = explode(' ', $r['class']);
 	}
- 	$r['class'] = array_map( 'sanitize_html_class', $r['class'] );
- 	$r['class'] = trim( join( ' ', $r['class'] ) );
+ 	$r['class'] = array_map('sanitize_html_class', $r['class']);
+ 	$r['class'] = trim(join(' ', $r['class']));
 
-	if ( $r['categorize'] ) {
-		$cats = get_terms( 'link_category', array(
+	if ($r['categorize']) {
+		$cats = get_terms('link_category', array(
 			'name__like' => $r['category_name'],
 			'include' => $r['category'],
 			'exclude' => $r['exclude_category'],
 			'orderby' => $r['category_orderby'],
 			'order' => $r['category_order'],
 			'hierarchical' => 0
-		) );
-		if ( empty( $cats ) ) {
+		));
+		if (empty($cats)) {
 			$r['categorize'] = false;
 		}
 	}
 
-	if ( $r['categorize'] ) {
+	if ($r['categorize']) {
 		// Split the bookmarks into ul's for each category
-		foreach ( (array) $cats as $cat ) {
-			$params = array_merge( $r, array( 'category' => $cat->term_id ) );
-			$bookmarks = get_bookmarks( $params );
-			if ( empty( $bookmarks ) ) {
+		foreach ((array) $cats as $cat) {
+			$params = array_merge($r, array('category' => $cat->term_id));
+			$bookmarks = get_bookmarks($params);
+			if (empty($bookmarks)) {
 				continue;
 			}
 			$output .= str_replace(
-				array( '%id', '%class' ),
-				array( "linkcat-$cat->term_id", $r['class'] ),
+				array('%id', '%class'),
+				array("linkcat-$cat->term_id", $r['class']),
 				$r['category_before']
 			);
 			/**
@@ -254,36 +254,36 @@ 
 			 *
 			 * @param string $cat_name The category name of bookmarks.
 			 */
-			$catname = apply_filters( 'link_category', $cat->name );
+			$catname = apply_filters('link_category', $cat->name);
 
 			$output .= $r['title_before'];
 			$output .= $catname;
 			$output .= $r['title_after'];
 			$output .= "\n\t<ul class='xoxo blogroll'>\n";
-			$output .= _walk_bookmarks( $bookmarks, $r );
+			$output .= _walk_bookmarks($bookmarks, $r);
 			$output .= "\n\t</ul>\n";
-			$output .= $r['category_after'] . "\n";
+			$output .= $r['category_after']."\n";
 		}
 	} else {
 		//output one single list using title_li for the title
-		$bookmarks = get_bookmarks( $r );
+		$bookmarks = get_bookmarks($r);
 
-		if ( ! empty( $bookmarks ) ) {
-			if ( ! empty( $r['title_li'] ) ) {
+		if ( ! empty($bookmarks)) {
+			if ( ! empty($r['title_li'])) {
 				$output .= str_replace(
-					array( '%id', '%class' ),
-					array( "linkcat-" . $r['category'], $r['class'] ),
+					array('%id', '%class'),
+					array("linkcat-".$r['category'], $r['class']),
 					$r['category_before']
 				);
 				$output .= $r['title_before'];
 				$output .= $r['title_li'];
 				$output .= $r['title_after'];
 				$output .= "\n\t<ul class='xoxo blogroll'>\n";
-				$output .= _walk_bookmarks( $bookmarks, $r );
+				$output .= _walk_bookmarks($bookmarks, $r);
 				$output .= "\n\t</ul>\n";
-				$output .= $r['category_after'] . "\n";
+				$output .= $r['category_after']."\n";
 			} else {
-				$output .= _walk_bookmarks( $bookmarks, $r );
+				$output .= _walk_bookmarks($bookmarks, $r);
 			}
 		}
 	}
@@ -295,9 +295,9 @@ 
 	 *
 	 * @param string $html The HTML list of bookmarks.
 	 */
-	$html = apply_filters( 'wp_list_bookmarks', $output );
+	$html = apply_filters('wp_list_bookmarks', $output);
 
-	if ( ! $r['echo'] ) {
+	if ( ! $r['echo']) {
 		return $html;
 	}
 	echo $html;

src/wp-includes/pluggable-deprecated.php

Braces +15 added lines, -10 removed lines

@@ -88,9 +88,10 @@ 
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_setcookie', '2.5', 'wp_set_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_clearcookie') ) :
@@ -104,9 +105,10 @@ 
 function wp_clearcookie() {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
 	wp_clear_auth_cookie();
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_clearcookie', '2.5', 'wp_clear_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_get_cookie_login') ):
@@ -124,9 +126,10 @@ 
 function wp_get_cookie_login() {
 	_deprecated_function( __FUNCTION__, '2.5' );
 	return false;
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_get_cookie_login', '2.5' );
+}
 endif;
 
 if ( !function_exists('wp_login') ) :
@@ -157,14 +160,16 @@ 
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
-		return true;
+	if ( ! is_wp_error($user) ) {
+			return true;
+	}
 
 	$error = $user->get_error_message();
 	return false;
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_login', '2.5', 'wp_signon()' );
+}
 endif;
 
 /**

Spacing +26 added lines, -26 removed lines

@@ -15,7 +15,7 @@ 
  * Deprecated functions come here to die.
  */
 
-if ( !function_exists('set_current_user') ) :
+if ( ! function_exists('set_current_user')) :
 /**
  * Changes the current user by ID or name.
  *
@@ -30,12 +30,12 @@ 
  * @return WP_User returns wp_set_current_user()
  */
 function set_current_user($id, $name = '') {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_set_current_user()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_set_current_user()');
 	return wp_set_current_user($id, $name);
 }
 endif;
 
-if ( !function_exists('get_currentuserinfo') ) :
+if ( ! function_exists('get_currentuserinfo')) :
 /**
  * Populate global variables with information about the currently logged in user.
  *
@@ -46,13 +46,13 @@ 
  * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
  */
 function get_currentuserinfo() {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'wp_get_current_user()' );
+	_deprecated_function(__FUNCTION__, '4.5.0', 'wp_get_current_user()');
 
 	return _wp_get_current_user();
 }
 endif;
 
-if ( !function_exists('get_userdatabylogin') ) :
+if ( ! function_exists('get_userdatabylogin')) :
 /**
  * Retrieve user info by login name.
  *
@@ -64,12 +64,12 @@ 
  * @return bool|object False on failure, User DB row object
  */
 function get_userdatabylogin($user_login) {
-	_deprecated_function( __FUNCTION__, '3.3.0', "get_user_by('login')" );
+	_deprecated_function(__FUNCTION__, '3.3.0', "get_user_by('login')");
 	return get_user_by('login', $user_login);
 }
 endif;
 
-if ( !function_exists('get_user_by_email') ) :
+if ( ! function_exists('get_user_by_email')) :
 /**
  * Retrieve user info by email.
  *
@@ -81,12 +81,12 @@ 
  * @return bool|object False on failure, User DB row object
  */
 function get_user_by_email($email) {
-	_deprecated_function( __FUNCTION__, '3.3.0', "get_user_by('email')" );
+	_deprecated_function(__FUNCTION__, '3.3.0', "get_user_by('email')");
 	return get_user_by('email', $email);
 }
 endif;
 
-if ( !function_exists('wp_setcookie') ) :
+if ( ! function_exists('wp_setcookie')) :
 /**
  * Sets a cookie for a user who just logged in. This function is deprecated.
  *
@@ -102,15 +102,15 @@ 
  * @param bool $remember Optional. Remember that the user is logged in
  */
 function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_set_auth_cookie()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_set_auth_cookie()');
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
 }
 else :
-	_deprecated_function( 'wp_setcookie', '2.5.0', 'wp_set_auth_cookie()' );
+	_deprecated_function('wp_setcookie', '2.5.0', 'wp_set_auth_cookie()');
 endif;
 
-if ( !function_exists('wp_clearcookie') ) :
+if ( ! function_exists('wp_clearcookie')) :
 /**
  * Clears the authentication cookie, logging the user out. This function is deprecated.
  *
@@ -119,14 +119,14 @@ 
  * @see wp_clear_auth_cookie()
  */
 function wp_clearcookie() {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()');
 	wp_clear_auth_cookie();
 }
 else :
-	_deprecated_function( 'wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()' );
+	_deprecated_function('wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()');
 endif;
 
-if ( !function_exists('wp_get_cookie_login') ):
+if ( ! function_exists('wp_get_cookie_login')):
 /**
  * Gets the user cookie login. This function is deprecated.
  *
@@ -139,14 +139,14 @@ 
  * @return bool Always returns false
  */
 function wp_get_cookie_login() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 	return false;
 }
 else :
-	_deprecated_function( 'wp_get_cookie_login', '2.5.0' );
+	_deprecated_function('wp_get_cookie_login', '2.5.0');
 endif;
 
-if ( !function_exists('wp_login') ) :
+if ( ! function_exists('wp_login')) :
 /**
  * Checks a users login information and logs them in if it checks out. This function is deprecated.
  *
@@ -169,19 +169,19 @@ 
  * @return bool False on login failure, true on successful check
  */
 function wp_login($username, $password, $deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_signon()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_signon()');
 	global $error;
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
+	if ( ! is_wp_error($user))
 		return true;
 
 	$error = $user->get_error_message();
 	return false;
 }
 else :
-	_deprecated_function( 'wp_login', '2.5.0', 'wp_signon()' );
+	_deprecated_function('wp_login', '2.5.0', 'wp_signon()');
 endif;
 
 /**
@@ -195,14 +195,14 @@ 
  *
  * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
-if ( ! class_exists( 'wp_atom_server', false ) ) {
+if ( ! class_exists('wp_atom_server', false)) {
 	class wp_atom_server {
-		public function __call( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5.0', 'the Atom Publishing Protocol plugin' );
+		public function __call($name, $arguments) {
+			_deprecated_function(__CLASS__.'::'.$name, '3.5.0', 'the Atom Publishing Protocol plugin');
 		}
 
-		public static function __callStatic( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5.0', 'the Atom Publishing Protocol plugin' );
+		public static function __callStatic($name, $arguments) {
+			_deprecated_function(__CLASS__.'::'.$name, '3.5.0', 'the Atom Publishing Protocol plugin');
 		}
 	}
 }

src/wp-includes/atomlib.php

Braces +6 added lines, -3 removed lines

@@ -137,7 +137,9 @@ 
 
         $fp = fopen($this->FILE, "r");
         while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+            if($this->debug) {
+            	$this->content .= $data;
+            }
 
             if(!xml_parse($parser, $data, feof($fp))) {
                 /* translators: 1: error message, 2: line number */
@@ -182,8 +184,9 @@ 
 
             $this->content_ns_decls = array();
 
-            if($this->is_html || $this->is_text)
-                trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+            if($this->is_html || $this->is_text) {
+                            trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+            }
 
             $attrs_prefix = array();
 

Indentation +289 added lines, -289 removed lines

@@ -21,20 +21,20 @@ 
 	 * @var array
 	 * @access public
 	 */
-    var $links = array();
-    /**
-     * Stores Categories
-     * @var array
-     * @access public
-     */
-    var $categories = array();
+	var $links = array();
+	/**
+	 * Stores Categories
+	 * @var array
+	 * @access public
+	 */
+	var $categories = array();
 	/**
 	 * Stores Entries
 	 *
 	 * @var array
 	 * @access public
 	 */
-    var $entries = array();
+	var $entries = array();
 }
 
 /**
@@ -48,13 +48,13 @@ 
 	 * @var array
 	 * @access public
 	 */
-    var $links = array();
-    /**
-     * Stores Categories
-     * @var array
+	var $links = array();
+	/**
+	 * Stores Categories
+	 * @var array
 	 * @access public
-     */
-    var $categories = array();
+	 */
+	var $categories = array();
 }
 
 /**
@@ -64,39 +64,39 @@ 
  */
 class AtomParser {
 
-    var $NS = 'http://www.w3.org/2005/Atom';
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
+	var $NS = 'http://www.w3.org/2005/Atom';
+	var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
+	var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
 
-    var $debug = false;
+	var $debug = false;
 
-    var $depth = 0;
-    var $indent = 2;
-    var $in_content;
-    var $ns_contexts = array();
-    var $ns_decls = array();
-    var $content_ns_decls = array();
-    var $content_ns_contexts = array();
-    var $is_xhtml = false;
-    var $is_html = false;
-    var $is_text = true;
-    var $skipped_div = false;
+	var $depth = 0;
+	var $indent = 2;
+	var $in_content;
+	var $ns_contexts = array();
+	var $ns_decls = array();
+	var $content_ns_decls = array();
+	var $content_ns_contexts = array();
+	var $is_xhtml = false;
+	var $is_html = false;
+	var $is_text = true;
+	var $skipped_div = false;
 
-    var $FILE = "php://input";
+	var $FILE = "php://input";
 
-    var $feed;
-    var $current;
+	var $feed;
+	var $current;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct() {
+	function __construct() {
 
-        $this->feed = new AtomFeed();
-        $this->current = null;
-        $this->map_attrs_func = array( __CLASS__, 'map_attrs' );
-        $this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
-    }
+		$this->feed = new AtomFeed();
+		$this->current = null;
+		$this->map_attrs_func = array( __CLASS__, 'map_attrs' );
+		$this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -131,264 +131,264 @@ 
 		return "{$xd}=\"{$n[1]}\"";
 	}
 
-    function _p($msg) {
-        if($this->debug) {
-            print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
-        }
-    }
+	function _p($msg) {
+		if($this->debug) {
+			print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
+		}
+	}
+
+	function error_handler($log_level, $log_text, $error_file, $error_line) {
+		$this->error = $log_text;
+	}
+
+	function parse() {
 
-    function error_handler($log_level, $log_text, $error_file, $error_line) {
-        $this->error = $log_text;
-    }
+		set_error_handler(array(&$this, 'error_handler'));
 
-    function parse() {
+		array_unshift($this->ns_contexts, array());
 
-        set_error_handler(array(&$this, 'error_handler'));
+		if ( ! function_exists( 'xml_parser_create_ns' ) ) {
+			trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+			return false;
+		}
+
+		$parser = xml_parser_create_ns();
+		xml_set_object($parser, $this);
+		xml_set_element_handler($parser, "start_element", "end_element");
+		xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
+		xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+		xml_set_character_data_handler($parser, "cdata");
+		xml_set_default_handler($parser, "_default");
+		xml_set_start_namespace_decl_handler($parser, "start_ns");
+		xml_set_end_namespace_decl_handler($parser, "end_ns");
+
+		$this->content = '';
+
+		$ret = true;
+
+		$fp = fopen($this->FILE, "r");
+		while ($data = fread($fp, 4096)) {
+			if($this->debug) $this->content .= $data;
+
+			if(!xml_parse($parser, $data, feof($fp))) {
+				/* translators: 1: error message, 2: line number */
+				trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
+					xml_error_string(xml_get_error_code($parser)),
+					xml_get_current_line_number($parser)));
+				$ret = false;
+				break;
+			}
+		}
+		fclose($fp);
 
-        array_unshift($this->ns_contexts, array());
+		xml_parser_free($parser);
 
-        if ( ! function_exists( 'xml_parser_create_ns' ) ) {
-        	trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
-        	return false;
-        }
+		restore_error_handler();
 
-        $parser = xml_parser_create_ns();
-        xml_set_object($parser, $this);
-        xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
-        xml_set_character_data_handler($parser, "cdata");
-        xml_set_default_handler($parser, "_default");
-        xml_set_start_namespace_decl_handler($parser, "start_ns");
-        xml_set_end_namespace_decl_handler($parser, "end_ns");
-
-        $this->content = '';
+		return $ret;
+	}
 
-        $ret = true;
-
-        $fp = fopen($this->FILE, "r");
-        while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+	function start_element($parser, $name, $attrs) {
 
-            if(!xml_parse($parser, $data, feof($fp))) {
-                /* translators: 1: error message, 2: line number */
-                trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
-                    xml_error_string(xml_get_error_code($parser)),
-                    xml_get_current_line_number($parser)));
-                $ret = false;
-                break;
-            }
-        }
-        fclose($fp);
+		$tag = array_pop(explode(":", $name));
 
-        xml_parser_free($parser);
-
-        restore_error_handler();
-
-        return $ret;
-    }
-
-    function start_element($parser, $name, $attrs) {
-
-        $tag = array_pop(explode(":", $name));
-
-        switch($name) {
-            case $this->NS . ':feed':
-                $this->current = $this->feed;
-                break;
-            case $this->NS . ':entry':
-                $this->current = new AtomEntry();
-                break;
-        };
-
-        $this->_p("start_element('$name')");
-        #$this->_p(print_r($this->ns_contexts,true));
-        #$this->_p('current(' . $this->current . ')');
-
-        array_unshift($this->ns_contexts, $this->ns_decls);
-
-        $this->depth++;
-
-        if(!empty($this->in_content)) {
-
-            $this->content_ns_decls = array();
-
-            if($this->is_html || $this->is_text)
-                trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
-
-            $attrs_prefix = array();
-
-            // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
-                $with_prefix = $this->ns_to_prefix($key, true);
-                $attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
-            }
-
-            $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
-            }
-
-            $with_prefix = $this->ns_to_prefix($name);
-
-            if(!$this->is_declared_content_ns($with_prefix[0])) {
-                array_push($this->content_ns_decls, $with_prefix[0]);
-            }
-
-            $xmlns_str = '';
-            if(count($this->content_ns_decls) > 0) {
-                array_unshift($this->content_ns_contexts, $this->content_ns_decls);
-                $xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
-                if(strlen($xmlns_str) > 0) {
-                    $xmlns_str = " " . $xmlns_str;
-                }
-            }
-
-            array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
-
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
-            $this->in_content = array();
-            $this->is_xhtml = $attrs['type'] == 'xhtml';
-            $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
-            $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
-            $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
-
-            if(in_array('src',array_keys($attrs))) {
-                $this->current->$tag = $attrs;
-            } else {
-                array_push($this->in_content, array($tag,$this->depth, $type));
-            }
-        } else if($tag == 'link') {
-            array_push($this->current->links, $attrs);
-        } else if($tag == 'category') {
-            array_push($this->current->categories, $attrs);
-        }
-
-        $this->ns_decls = array();
-    }
-
-    function end_element($parser, $name) {
-
-        $tag = array_pop(explode(":", $name));
-
-        $ccount = count($this->in_content);
-
-        # if we are *in* content, then let's proceed to serialize it
-        if(!empty($this->in_content)) {
-            # if we are ending the original content element
-            # then let's finalize the content
-            if($this->in_content[0][0] == $tag &&
-                $this->in_content[0][1] == $this->depth) {
-                $origtype = $this->in_content[0][2];
-                array_shift($this->in_content);
-                $newcontent = array();
-                foreach($this->in_content as $c) {
-                    if(count($c) == 3) {
-                        array_push($newcontent, $c[2]);
-                    } else {
-                        if($this->is_xhtml || $this->is_text) {
-                            array_push($newcontent, $this->xml_escape($c));
-                        } else {
-                            array_push($newcontent, $c);
-                        }
-                    }
-                }
-                if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
-                    $this->current->$tag = array($origtype, join('',$newcontent));
-                } else {
-                    $this->current->$tag = join('',$newcontent);
-                }
-                $this->in_content = array();
-            } else if($this->in_content[$ccount-1][0] == $tag &&
-                $this->in_content[$ccount-1][1] == $this->depth) {
-                $this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
-            } else {
-                # else, just finalize the current element's content
-                $endtag = $this->ns_to_prefix($name);
-                array_push($this->in_content, array($tag, $this->depth, "</$endtag[1]>"));
-            }
-        }
-
-        array_shift($this->ns_contexts);
-
-        $this->depth--;
-
-        if($name == ($this->NS . ':entry')) {
-            array_push($this->feed->entries, $this->current);
-            $this->current = null;
-        }
-
-        $this->_p("end_element('$name')");
-    }
-
-    function start_ns($parser, $prefix, $uri) {
-        $this->_p("starting: " . $prefix . ":" . $uri);
-        array_push($this->ns_decls, array($prefix,$uri));
-    }
-
-    function end_ns($parser, $prefix) {
-        $this->_p("ending: #" . $prefix . "#");
-    }
-
-    function cdata($parser, $data) {
-        $this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
-        if(!empty($this->in_content)) {
-            array_push($this->in_content, $data);
-        }
-    }
-
-    function _default($parser, $data) {
-        # when does this gets called?
-    }
-
-
-    function ns_to_prefix($qname, $attr=false) {
-        # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
-        $components = explode(":", $qname);
-
-        # grab the last one (e.g 'div')
-        $name = array_pop($components);
-
-        if(!empty($components)) {
-            # re-join back the namespace component
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
-                        return array($mapping, "$mapping[0]:$name");
-                    }
-                }
-            }
-        }
-
-        if($attr) {
-            return array(null, $name);
-        } else {
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if(strlen($mapping[0]) == 0) {
-                        return array($mapping, $name);
-                    }
-                }
-            }
-        }
-    }
-
-    function is_declared_content_ns($new_mapping) {
-        foreach($this->content_ns_contexts as $context) {
-            foreach($context as $mapping) {
-                if($new_mapping == $mapping) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function xml_escape($string)
-    {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
-    }
+		switch($name) {
+			case $this->NS . ':feed':
+				$this->current = $this->feed;
+				break;
+			case $this->NS . ':entry':
+				$this->current = new AtomEntry();
+				break;
+		};
+
+		$this->_p("start_element('$name')");
+		#$this->_p(print_r($this->ns_contexts,true));
+		#$this->_p('current(' . $this->current . ')');
+
+		array_unshift($this->ns_contexts, $this->ns_decls);
+
+		$this->depth++;
+
+		if(!empty($this->in_content)) {
+
+			$this->content_ns_decls = array();
+
+			if($this->is_html || $this->is_text)
+				trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+
+			$attrs_prefix = array();
+
+			// resolve prefixes for attributes
+			foreach($attrs as $key => $value) {
+				$with_prefix = $this->ns_to_prefix($key, true);
+				$attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
+			}
+
+			$attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
+			if(strlen($attrs_str) > 0) {
+				$attrs_str = " " . $attrs_str;
+			}
+
+			$with_prefix = $this->ns_to_prefix($name);
+
+			if(!$this->is_declared_content_ns($with_prefix[0])) {
+				array_push($this->content_ns_decls, $with_prefix[0]);
+			}
+
+			$xmlns_str = '';
+			if(count($this->content_ns_decls) > 0) {
+				array_unshift($this->content_ns_contexts, $this->content_ns_decls);
+				$xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
+				if(strlen($xmlns_str) > 0) {
+					$xmlns_str = " " . $xmlns_str;
+				}
+			}
+
+			array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
+
+		} else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+			$this->in_content = array();
+			$this->is_xhtml = $attrs['type'] == 'xhtml';
+			$this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
+			$this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
+			$type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
+
+			if(in_array('src',array_keys($attrs))) {
+				$this->current->$tag = $attrs;
+			} else {
+				array_push($this->in_content, array($tag,$this->depth, $type));
+			}
+		} else if($tag == 'link') {
+			array_push($this->current->links, $attrs);
+		} else if($tag == 'category') {
+			array_push($this->current->categories, $attrs);
+		}
+
+		$this->ns_decls = array();
+	}
+
+	function end_element($parser, $name) {
+
+		$tag = array_pop(explode(":", $name));
+
+		$ccount = count($this->in_content);
+
+		# if we are *in* content, then let's proceed to serialize it
+		if(!empty($this->in_content)) {
+			# if we are ending the original content element
+			# then let's finalize the content
+			if($this->in_content[0][0] == $tag &&
+				$this->in_content[0][1] == $this->depth) {
+				$origtype = $this->in_content[0][2];
+				array_shift($this->in_content);
+				$newcontent = array();
+				foreach($this->in_content as $c) {
+					if(count($c) == 3) {
+						array_push($newcontent, $c[2]);
+					} else {
+						if($this->is_xhtml || $this->is_text) {
+							array_push($newcontent, $this->xml_escape($c));
+						} else {
+							array_push($newcontent, $c);
+						}
+					}
+				}
+				if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
+					$this->current->$tag = array($origtype, join('',$newcontent));
+				} else {
+					$this->current->$tag = join('',$newcontent);
+				}
+				$this->in_content = array();
+			} else if($this->in_content[$ccount-1][0] == $tag &&
+				$this->in_content[$ccount-1][1] == $this->depth) {
+				$this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
+			} else {
+				# else, just finalize the current element's content
+				$endtag = $this->ns_to_prefix($name);
+				array_push($this->in_content, array($tag, $this->depth, "</$endtag[1]>"));
+			}
+		}
+
+		array_shift($this->ns_contexts);
+
+		$this->depth--;
+
+		if($name == ($this->NS . ':entry')) {
+			array_push($this->feed->entries, $this->current);
+			$this->current = null;
+		}
+
+		$this->_p("end_element('$name')");
+	}
+
+	function start_ns($parser, $prefix, $uri) {
+		$this->_p("starting: " . $prefix . ":" . $uri);
+		array_push($this->ns_decls, array($prefix,$uri));
+	}
+
+	function end_ns($parser, $prefix) {
+		$this->_p("ending: #" . $prefix . "#");
+	}
+
+	function cdata($parser, $data) {
+		$this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
+		if(!empty($this->in_content)) {
+			array_push($this->in_content, $data);
+		}
+	}
+
+	function _default($parser, $data) {
+		# when does this gets called?
+	}
+
+
+	function ns_to_prefix($qname, $attr=false) {
+		# split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
+		$components = explode(":", $qname);
+
+		# grab the last one (e.g 'div')
+		$name = array_pop($components);
+
+		if(!empty($components)) {
+			# re-join back the namespace component
+			$ns = join(":",$components);
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+						return array($mapping, "$mapping[0]:$name");
+					}
+				}
+			}
+		}
+
+		if($attr) {
+			return array(null, $name);
+		} else {
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if(strlen($mapping[0]) == 0) {
+						return array($mapping, $name);
+					}
+				}
+			}
+		}
+	}
+
+	function is_declared_content_ns($new_mapping) {
+		foreach($this->content_ns_contexts as $context) {
+			foreach($context as $mapping) {
+				if($new_mapping == $mapping) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	function xml_escape($string)
+	{
+			 return str_replace(array('&','"',"'",'<','>'),
+				array('&amp;','&quot;','&apos;','&lt;','&gt;'),
+				$string );
+	}
 }

Spacing +65 added lines, -65 removed lines

@@ -65,8 +65,8 @@ 
 class AtomParser {
 
     var $NS = 'http://www.w3.org/2005/Atom';
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
+    var $ATOM_CONTENT_ELEMENTS = array('content', 'summary', 'title', 'subtitle', 'rights');
+    var $ATOM_SIMPLE_ELEMENTS = array('id', 'updated', 'published', 'draft');
 
     var $debug = false;
 
@@ -94,8 +94,8 @@ 
 
         $this->feed = new AtomFeed();
         $this->current = null;
-        $this->map_attrs_func = array( __CLASS__, 'map_attrs' );
-        $this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
+        $this->map_attrs_func = array(__CLASS__, 'map_attrs');
+        $this->map_xmlns_func = array(__CLASS__, 'map_xmlns');
     }
 
 	/**
@@ -125,15 +125,15 @@ 
 	 */
 	public static function map_xmlns($p, $n) {
 		$xd = "xmlns";
-		if( 0 < strlen($n[0]) ) {
+		if (0 < strlen($n[0])) {
 			$xd .= ":{$n[0]}";
 		}
 		return "{$xd}=\"{$n[1]}\"";
 	}
 
     function _p($msg) {
-        if($this->debug) {
-            print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
+        if ($this->debug) {
+            print str_repeat(" ", $this->depth * $this->indent).$msg."\n";
         }
     }
 
@@ -147,16 +147,16 @@ 
 
         array_unshift($this->ns_contexts, array());
 
-        if ( ! function_exists( 'xml_parser_create_ns' ) ) {
-        	trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+        if ( ! function_exists('xml_parser_create_ns')) {
+        	trigger_error(__("PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension."));
         	return false;
         }
 
         $parser = xml_parser_create_ns();
         xml_set_object($parser, $this);
         xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
         xml_set_character_data_handler($parser, "cdata");
         xml_set_default_handler($parser, "_default");
         xml_set_start_namespace_decl_handler($parser, "start_ns");
@@ -168,9 +168,9 @@ 
 
         $fp = fopen($this->FILE, "r");
         while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+            if ($this->debug) $this->content .= $data;
 
-            if(!xml_parse($parser, $data, feof($fp))) {
+            if ( ! xml_parse($parser, $data, feof($fp))) {
                 /* translators: 1: error message, 2: line number */
                 trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
                     xml_error_string(xml_get_error_code($parser)),
@@ -192,11 +192,11 @@ 
 
         $tag = array_pop(explode(":", $name));
 
-        switch($name) {
-            case $this->NS . ':feed':
+        switch ($name) {
+            case $this->NS.':feed':
                 $this->current = $this->feed;
                 break;
-            case $this->NS . ':entry':
+            case $this->NS.':entry':
                 $this->current = new AtomEntry();
                 break;
         };
@@ -209,58 +209,58 @@ 
 
         $this->depth++;
 
-        if(!empty($this->in_content)) {
+        if ( ! empty($this->in_content)) {
 
             $this->content_ns_decls = array();
 
-            if($this->is_html || $this->is_text)
+            if ($this->is_html || $this->is_text)
                 trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
 
             $attrs_prefix = array();
 
             // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
+            foreach ($attrs as $key => $value) {
                 $with_prefix = $this->ns_to_prefix($key, true);
                 $attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
             }
 
             $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
+            if (strlen($attrs_str) > 0) {
+                $attrs_str = " ".$attrs_str;
             }
 
             $with_prefix = $this->ns_to_prefix($name);
 
-            if(!$this->is_declared_content_ns($with_prefix[0])) {
+            if ( ! $this->is_declared_content_ns($with_prefix[0])) {
                 array_push($this->content_ns_decls, $with_prefix[0]);
             }
 
             $xmlns_str = '';
-            if(count($this->content_ns_decls) > 0) {
+            if (count($this->content_ns_decls) > 0) {
                 array_unshift($this->content_ns_contexts, $this->content_ns_decls);
                 $xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
-                if(strlen($xmlns_str) > 0) {
-                    $xmlns_str = " " . $xmlns_str;
+                if (strlen($xmlns_str) > 0) {
+                    $xmlns_str = " ".$xmlns_str;
                 }
             }
 
-            array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
+            array_push($this->in_content, array($tag, $this->depth, "<".$with_prefix[1]."{$xmlns_str}{$attrs_str}".">"));
 
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+        } else if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
             $this->in_content = array();
             $this->is_xhtml = $attrs['type'] == 'xhtml';
             $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
-            $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
+            $this->is_text = ! in_array('type', array_keys($attrs)) || $attrs['type'] == 'text';
             $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
 
-            if(in_array('src',array_keys($attrs))) {
+            if (in_array('src', array_keys($attrs))) {
                 $this->current->$tag = $attrs;
             } else {
-                array_push($this->in_content, array($tag,$this->depth, $type));
+                array_push($this->in_content, array($tag, $this->depth, $type));
             }
-        } else if($tag == 'link') {
+        } else if ($tag == 'link') {
             array_push($this->current->links, $attrs);
-        } else if($tag == 'category') {
+        } else if ($tag == 'category') {
             array_push($this->current->categories, $attrs);
         }
 
@@ -274,34 +274,34 @@ 
         $ccount = count($this->in_content);
 
         # if we are *in* content, then let's proceed to serialize it
-        if(!empty($this->in_content)) {
+        if ( ! empty($this->in_content)) {
             # if we are ending the original content element
             # then let's finalize the content
-            if($this->in_content[0][0] == $tag &&
+            if ($this->in_content[0][0] == $tag &&
                 $this->in_content[0][1] == $this->depth) {
                 $origtype = $this->in_content[0][2];
                 array_shift($this->in_content);
                 $newcontent = array();
-                foreach($this->in_content as $c) {
-                    if(count($c) == 3) {
+                foreach ($this->in_content as $c) {
+                    if (count($c) == 3) {
                         array_push($newcontent, $c[2]);
                     } else {
-                        if($this->is_xhtml || $this->is_text) {
+                        if ($this->is_xhtml || $this->is_text) {
                             array_push($newcontent, $this->xml_escape($c));
                         } else {
                             array_push($newcontent, $c);
                         }
                     }
                 }
-                if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
-                    $this->current->$tag = array($origtype, join('',$newcontent));
+                if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
+                    $this->current->$tag = array($origtype, join('', $newcontent));
                 } else {
-                    $this->current->$tag = join('',$newcontent);
+                    $this->current->$tag = join('', $newcontent);
                 }
                 $this->in_content = array();
-            } else if($this->in_content[$ccount-1][0] == $tag &&
-                $this->in_content[$ccount-1][1] == $this->depth) {
-                $this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
+            } else if ($this->in_content[$ccount - 1][0] == $tag &&
+                $this->in_content[$ccount - 1][1] == $this->depth) {
+                $this->in_content[$ccount - 1][2] = substr($this->in_content[$ccount - 1][2], 0, -1)."/>";
             } else {
                 # else, just finalize the current element's content
                 $endtag = $this->ns_to_prefix($name);
@@ -313,7 +313,7 @@ 
 
         $this->depth--;
 
-        if($name == ($this->NS . ':entry')) {
+        if ($name == ($this->NS.':entry')) {
             array_push($this->feed->entries, $this->current);
             $this->current = null;
         }
@@ -322,17 +322,17 @@ 
     }
 
     function start_ns($parser, $prefix, $uri) {
-        $this->_p("starting: " . $prefix . ":" . $uri);
-        array_push($this->ns_decls, array($prefix,$uri));
+        $this->_p("starting: ".$prefix.":".$uri);
+        array_push($this->ns_decls, array($prefix, $uri));
     }
 
     function end_ns($parser, $prefix) {
-        $this->_p("ending: #" . $prefix . "#");
+        $this->_p("ending: #".$prefix."#");
     }
 
     function cdata($parser, $data) {
-        $this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
-        if(!empty($this->in_content)) {
+        $this->_p("data: #".str_replace(array("\n"), array("\\n"), trim($data))."#");
+        if ( ! empty($this->in_content)) {
             array_push($this->in_content, $data);
         }
     }
@@ -342,31 +342,31 @@ 
     }
 
 
-    function ns_to_prefix($qname, $attr=false) {
+    function ns_to_prefix($qname, $attr = false) {
         # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
         $components = explode(":", $qname);
 
         # grab the last one (e.g 'div')
         $name = array_pop($components);
 
-        if(!empty($components)) {
+        if ( ! empty($components)) {
             # re-join back the namespace component
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+            $ns = join(":", $components);
+            foreach ($this->ns_contexts as $context) {
+                foreach ($context as $mapping) {
+                    if ($mapping[1] == $ns && strlen($mapping[0]) > 0) {
                         return array($mapping, "$mapping[0]:$name");
                     }
                 }
             }
         }
 
-        if($attr) {
+        if ($attr) {
             return array(null, $name);
         } else {
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if(strlen($mapping[0]) == 0) {
+            foreach ($this->ns_contexts as $context) {
+                foreach ($context as $mapping) {
+                    if (strlen($mapping[0]) == 0) {
                         return array($mapping, $name);
                     }
                 }
@@ -375,9 +375,9 @@ 
     }
 
     function is_declared_content_ns($new_mapping) {
-        foreach($this->content_ns_contexts as $context) {
-            foreach($context as $mapping) {
-                if($new_mapping == $mapping) {
+        foreach ($this->content_ns_contexts as $context) {
+            foreach ($context as $mapping) {
+                if ($new_mapping == $mapping) {
                     return true;
                 }
             }
@@ -387,8 +387,8 @@ 
 
     function xml_escape($string)
     {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
+             return str_replace(array('&', '"', "'", '<', '>'),
+                array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'),
+                $string);
     }
 }

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

Braces +25 added lines, -18 removed lines

@@ -44,17 +44,20 @@ 
 	 * @return bool
 	 */
 	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
-			return false;
+		if ( !parent::do_item($handle) ) {
+					return false;
+		}
 
 		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
-			$ver = '';
-		else
-			$ver = $obj->ver ? $obj->ver : $this->default_version;
+		if ( null === $obj->ver ) {
+					$ver = '';
+		} else {
+					$ver = $obj->ver ? $obj->ver : $this->default_version;
+		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		if ( isset($this->args[$handle]) ) {
+					$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		}
 
 		if ( $this->do_concat ) {
 			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
@@ -67,10 +70,11 @@ 
 			}
 		}
 
-		if ( isset($obj->args) )
-			$media = esc_attr( $obj->args );
-		else
-			$media = 'all';
+		if ( isset($obj->args) ) {
+					$media = esc_attr( $obj->args );
+		} else {
+					$media = 'all';
+		}
 
 		$href = $this->_css_href( $obj->src, $ver, $handle );
 		if ( empty( $href ) ) {
@@ -206,8 +210,9 @@ 
 			$src = $this->base_url . $src;
 		}
 
-		if ( !empty($ver) )
-			$src = add_query_arg('ver', $ver, $src);
+		if ( !empty($ver) ) {
+					$src = add_query_arg('ver', $ver, $src);
+		}
 
 		/**
 		 * Filter an enqueued style's fully-qualified URL.
@@ -226,12 +231,14 @@ 
 	 * @return bool
 	 */
 	public function in_default_dir($src) {
-		if ( ! $this->default_dirs )
-			return true;
+		if ( ! $this->default_dirs ) {
+					return true;
+		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
-				return true;
+			if ( 0 === strpos($src, $test) ) {
+							return true;
+			}
 		}
 		return false;
 	}

Spacing +56 added lines, -56 removed lines

@@ -124,7 +124,7 @@ 
 		 *
 		 * @param WP_Styles &$this WP_Styles instance, passed by reference.
 		 */
-		do_action_ref_array( 'wp_default_styles', array(&$this) );
+		do_action_ref_array('wp_default_styles', array(&$this));
 	}
 
 	/**
@@ -138,40 +138,40 @@ 
 	 * @param string $handle The style's registered handle.
 	 * @return bool True on success, false on failure.
 	 */
-	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
+	public function do_item($handle) {
+		if ( ! parent::do_item($handle))
 			return false;
 
 		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
+		if (null === $obj->ver)
 			$ver = '';
 		else
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		if (isset($this->args[$handle]))
+			$ver = $ver ? $ver.'&'.$this->args[$handle] : $this->args[$handle];
 
-		if ( $this->do_concat ) {
-			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
+		if ($this->do_concat) {
+			if ($this->in_default_dir($obj->src) && ! isset($obj->extra['conditional']) && ! isset($obj->extra['alt'])) {
 				$this->concat .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 
-				$this->print_code .= $this->print_inline_style( $handle, false );
+				$this->print_code .= $this->print_inline_style($handle, false);
 
 				return true;
 			}
 		}
 
-		if ( isset($obj->args) )
-			$media = esc_attr( $obj->args );
+		if (isset($obj->args))
+			$media = esc_attr($obj->args);
 		else
 			$media = 'all';
 
 		// A single item may alias a set of items, by having dependencies, but no source.
-		if ( ! $obj->src ) {
-			if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
-				$inline_style = sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
-				if ( $this->do_concat ) {
+		if ( ! $obj->src) {
+			if ($inline_style = $this->print_inline_style($handle, false)) {
+				$inline_style = sprintf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $inline_style);
+				if ($this->do_concat) {
 					$this->print_html .= $inline_style;
 				} else {
 					echo $inline_style;
@@ -180,13 +180,13 @@ 
 			return true;
 		}
 
-		$href = $this->_css_href( $obj->src, $ver, $handle );
-		if ( ! $href ) {
+		$href = $this->_css_href($obj->src, $ver, $handle);
+		if ( ! $href) {
 			return true;
 		}
 
 		$rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-		$title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
+		$title = isset($obj->extra['title']) ? "title='".esc_attr($obj->extra['title'])."'" : '';
 
 		/**
 		 * Filter the HTML link tag of an enqueued style.
@@ -200,19 +200,19 @@ 
 		 * @param string $href   The stylesheet's source URL.
 		 * @param string $media  The stylesheet's media attribute.
 		 */
-		$tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media);
-		if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
-			if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
-				$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
-				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
+		$tag = apply_filters('style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media);
+		if ('rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl']) {
+			if (is_bool($obj->extra['rtl']) || 'replace' === $obj->extra['rtl']) {
+				$suffix = isset($obj->extra['suffix']) ? $obj->extra['suffix'] : '';
+				$rtl_href = str_replace("{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href($obj->src, $ver, "$handle-rtl"));
 			} else {
-				$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
+				$rtl_href = $this->_css_href($obj->extra['rtl'], $ver, "$handle-rtl");
 			}
 
 			/** This filter is documented in wp-includes/class.wp-styles.php */
-			$rtl_tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle, $rtl_href, $media );
+			$rtl_tag = apply_filters('style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle, $rtl_href, $media);
 
-			if ( $obj->extra['rtl'] === 'replace' ) {
+			if ($obj->extra['rtl'] === 'replace') {
 				$tag = $rtl_tag;
 			} else {
 				$tag .= $rtl_tag;
@@ -220,22 +220,22 @@ 
 		}
 
 		$conditional_pre = $conditional_post = '';
-		if ( isset( $obj->extra['conditional'] ) && $obj->extra['conditional'] ) {
+		if (isset($obj->extra['conditional']) && $obj->extra['conditional']) {
 			$conditional_pre  = "<!--[if {$obj->extra['conditional']}]>\n";
 			$conditional_post = "<![endif]-->\n";
 		}
 
-		if ( $this->do_concat ) {
+		if ($this->do_concat) {
 			$this->print_html .= $conditional_pre;
 			$this->print_html .= $tag;
-			if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
-				$this->print_html .= sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+			if ($inline_style = $this->print_inline_style($handle, false)) {
+				$this->print_html .= sprintf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $inline_style);
 			}
 			$this->print_html .= $conditional_post;
 		} else {
 			echo $conditional_pre;
 			echo $tag;
-			$this->print_inline_style( $handle );
+			$this->print_inline_style($handle);
 			echo $conditional_post;
 		}
 
@@ -252,19 +252,19 @@ 
 	 * @param string $code   String containing the CSS styles to be added.
 	 * @return bool True on success, false on failure.
 	 */
-	public function add_inline_style( $handle, $code ) {
-		if ( ! $code ) {
+	public function add_inline_style($handle, $code) {
+		if ( ! $code) {
 			return false;
 		}
 
-		$after = $this->get_data( $handle, 'after' );
-		if ( ! $after ) {
+		$after = $this->get_data($handle, 'after');
+		if ( ! $after) {
 			$after = array();
 		}
 
 		$after[] = $code;
 
-		return $this->add_data( $handle, 'after', $after );
+		return $this->add_data($handle, 'after', $after);
 	}
 
 	/**
@@ -278,20 +278,20 @@ 
 	 *                       Default true.
 	 * @return string|bool False if no data exists, inline styles if `$echo` is true, true otherwise.
 	 */
-	public function print_inline_style( $handle, $echo = true ) {
-		$output = $this->get_data( $handle, 'after' );
+	public function print_inline_style($handle, $echo = true) {
+		$output = $this->get_data($handle, 'after');
 
-		if ( empty( $output ) ) {
+		if (empty($output)) {
 			return false;
 		}
 
-		$output = implode( "\n", $output );
+		$output = implode("\n", $output);
 
-		if ( ! $echo ) {
+		if ( ! $echo) {
 			return $output;
 		}
 
-		printf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $output );
+		printf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $output);
 
 		return true;
 	}
@@ -309,9 +309,9 @@ 
 	 * @param int|false $group     Group level: (int) level, (false) no groups.
 	 * @return bool True on success, false on failure.
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		$r = parent::all_deps( $handles, $recursion, $group );
-		if ( ! $recursion ) {
+	public function all_deps($handles, $recursion = false, $group = false) {
+		$r = parent::all_deps($handles, $recursion, $group);
+		if ( ! $recursion) {
 			/**
 			 * Filter the array of enqueued styles before processing for output.
 			 *
@@ -319,7 +319,7 @@ 
 			 *
 			 * @param array $to_do The list of enqueued styles about to be processed.
 			 */
-			$this->to_do = apply_filters( 'print_styles_array', $this->to_do );
+			$this->to_do = apply_filters('print_styles_array', $this->to_do);
 		}
 		return $r;
 	}
@@ -335,12 +335,12 @@ 
 	 * @param string $handle The style's registered handle.
 	 * @return string Style's fully-qualified URL.
 	 */
-	public function _css_href( $src, $ver, $handle ) {
-		if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
-			$src = $this->base_url . $src;
+	public function _css_href($src, $ver, $handle) {
+		if ( ! is_bool($src) && ! preg_match('|^(https?:)?//|', $src) && ! ($this->content_url && 0 === strpos($src, $this->content_url))) {
+			$src = $this->base_url.$src;
 		}
 
-		if ( !empty($ver) )
+		if ( ! empty($ver))
 			$src = add_query_arg('ver', $ver, $src);
 
 		/**
@@ -351,8 +351,8 @@ 
 		 * @param string $src    The source URL of the enqueued style.
 		 * @param string $handle The style's registered handle.
 		 */
-		$src = apply_filters( 'style_loader_src', $src, $handle );
-		return esc_url( $src );
+		$src = apply_filters('style_loader_src', $src, $handle);
+		return esc_url($src);
 	}
 
 	/**
@@ -364,12 +364,12 @@ 
 	 * @param string $src The source of the enqueued style.
 	 * @return bool True if found, false if not.
 	 */
-	public function in_default_dir( $src ) {
-		if ( ! $this->default_dirs )
+	public function in_default_dir($src) {
+		if ( ! $this->default_dirs)
 			return true;
 
-		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
+		foreach ((array) $this->default_dirs as $test) {
+			if (0 === strpos($src, $test))
 				return true;
 		}
 		return false;

src/wp-includes/class-wp-image-editor-gd.php

Braces +57 added lines, -42 removed lines

@@ -42,8 +42,9 @@ 
 	 * @return bool
 	 */
 	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
-			return false;
+		if ( ! extension_loaded('gd') || ! function_exists('gd_info') ) {
+					return false;
+		}
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
 		if ( isset( $args['methods'] ) &&
@@ -90,11 +91,13 @@ 
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
-			return true;
+		if ( $this->image ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		}
 
 		/**
 		 * Filter the memory limit allocated for image manipulation.
@@ -109,12 +112,14 @@ 
 
 		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource( $this->image ) ) {
+					return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		}
 
 		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		if ( ! $size ) {
+					return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		}
 
 		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
 			imagealphablending( $this->image, false );
@@ -138,11 +143,13 @@ 
 	 * @return true
 	 */
 	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
-			$width = imagesx( $this->image );
+		if ( ! $width ) {
+					$width = imagesx( $this->image );
+		}
 
-		if ( ! $height )
-			$height = imagesy( $this->image );
+		if ( ! $height ) {
+					$height = imagesy( $this->image );
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -164,8 +171,9 @@ 
 	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$resized = $this->_resize( $max_w, $max_h, $crop );
 
@@ -174,8 +182,9 @@ 
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
-			return $resized;
+		} elseif ( is_wp_error( $resized ) ) {
+					return $resized;
+		}
 
 		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
 	}
@@ -284,10 +293,12 @@ 
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
-			$dst_w = $src_w;
-		if ( ! $dst_h )
-			$dst_h = $src_h;
+		if ( ! $dst_w ) {
+					$dst_w = $src_w;
+		}
+		if ( ! $dst_h ) {
+					$dst_h = $src_h;
+		}
 
 		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
 
@@ -296,8 +307,9 @@ 
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
-			imageantialias( $dst, true );
+		if ( function_exists( 'imageantialias' ) ) {
+					imageantialias( $dst, true );
+		}
 
 		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 
@@ -398,26 +410,28 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/png' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} elseif ( 'image/png' == $mime_type ) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
-				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) ) {
+							imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			}
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		else {
+			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} elseif ( 'image/jpeg' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} else {
 			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
 		}
 
@@ -479,8 +493,9 @@ 
 	 * @return bool
 	 */
 	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
-			$arguments[1] = null;
+		if ( wp_is_stream( $filename ) ) {
+					$arguments[1] = null;
+		}
 
 		return parent::make_image( $filename, $function, $arguments );
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	/**
 	 * @param resource $fh
-	 * @return true
+	 * @return boolean
 	 */
 	function export_to_file_handle($fh) {
 		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

Spacing +120 added lines, -120 removed lines

@@ -24,9 +24,9 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image ) {
+		if ($this->image) {
 			// we don't need the original in memory anymore
-			imagedestroy( $this->image );
+			imagedestroy($this->image);
 		}
 	}
 
@@ -41,14 +41,14 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
+	public static function test($args = array()) {
+		if ( ! extension_loaded('gd') || ! function_exists('gd_info'))
 			return false;
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( isset( $args['methods'] ) &&
-			 in_array( 'rotate', $args['methods'] ) &&
-			 ! function_exists('imagerotate') ){
+		if (isset($args['methods']) &&
+			 in_array('rotate', $args['methods']) &&
+			 ! function_exists('imagerotate')) {
 
 				return false;
 		}
@@ -67,9 +67,9 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
+	public static function supports_mime_type($mime_type) {
 		$image_types = imagetypes();
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return ($image_types & IMG_JPG) != 0;
 			case 'image/png':
@@ -90,30 +90,30 @@ 
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
+		if ($this->image)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn’t exist?'), $this->file);
 
 		// Set artificially high because GD uses uncompressed images in memory.
-		wp_raise_memory_limit( 'image' );
+		wp_raise_memory_limit('image');
 
-		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
+		$this->image = @imagecreatefromstring(file_get_contents($this->file));
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource($this->image))
+			return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
-		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		$size = @getimagesize($this->file);
+		if ( ! $size)
+			return new WP_Error('invalid_image', __('Could not read image size.'), $this->file);
 
-		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
-			imagealphablending( $this->image, false );
-			imagesavealpha( $this->image, true );
+		if (function_exists('imagealphablending') && function_exists('imagesavealpha')) {
+			imagealphablending($this->image, false);
+			imagesavealpha($this->image, true);
 		}
 
-		$this->update_size( $size[0], $size[1] );
+		$this->update_size($size[0], $size[1]);
 		$this->mime_type = $size['mime'];
 
 		return $this->set_quality();
@@ -129,14 +129,14 @@ 
 	 * @param int $height
 	 * @return true
 	 */
-	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
-			$width = imagesx( $this->image );
+	protected function update_size($width = false, $height = false) {
+		if ( ! $width)
+			$width = imagesx($this->image);
 
-		if ( ! $height )
-			$height = imagesy( $this->image );
+		if ( ! $height)
+			$height = imagesy($this->image);
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -155,21 +155,21 @@ 
 	 * @param  bool     $crop
 	 * @return true|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$resized = $this->_resize( $max_w, $max_h, $crop );
+		$resized = $this->_resize($max_w, $max_h, $crop);
 
-		if ( is_resource( $resized ) ) {
-			imagedestroy( $this->image );
+		if (is_resource($resized)) {
+			imagedestroy($this->image);
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
+		} elseif (is_wp_error($resized))
 			return $resized;
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error('image_resize_error', __('Image resize failed.'), $this->file);
 	}
 
 	/**
@@ -179,22 +179,22 @@ 
 	 * @param bool|array $crop
 	 * @return resource|WP_Error
 	 */
-	protected function _resize( $max_w, $max_h, $crop = false ) {
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims ) {
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file );
+	protected function _resize($max_w, $max_h, $crop = false) {
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims) {
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file);
 		}
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		$resized = wp_imagecreatetruecolor( $dst_w, $dst_h );
-		imagecopyresampled( $resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+		$resized = wp_imagecreatetruecolor($dst_w, $dst_h);
+		imagecopyresampled($resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 
-		if ( is_resource( $resized ) ) {
-			$this->update_size( $dst_w, $dst_h );
+		if (is_resource($resized)) {
+			$this->update_size($dst_w, $dst_h);
 			return $resized;
 		}
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error('image_resize_error', __('Image resize failed.'), $this->file);
 	}
 
 	/**
@@ -220,36 +220,36 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+		foreach ($sizes as $size => $size_data) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$image = $this->_resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $image ) && ! $duplicate ) {
-				$resized = $this->_save( $image );
+			if ( ! is_wp_error($image) && ! $duplicate) {
+				$resized = $this->_save($image);
 
-				imagedestroy( $image );
+				imagedestroy($image);
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -275,34 +275,34 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
+		if ( ! $dst_w)
 			$dst_w = $src_w;
-		if ( ! $dst_h )
+		if ( ! $dst_h)
 			$dst_h = $src_h;
 
-		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
+		$dst = wp_imagecreatetruecolor($dst_w, $dst_h);
 
-		if ( $src_abs ) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
-			imageantialias( $dst, true );
+		if (function_exists('imageantialias'))
+			imageantialias($dst, true);
 
-		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+		imagecopyresampled($dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 
-		if ( is_resource( $dst ) ) {
-			imagedestroy( $this->image );
+		if (is_resource($dst)) {
+			imagedestroy($this->image);
 			$this->image = $dst;
 			$this->update_size();
 			return true;
 		}
 
-		return new WP_Error( 'image_crop_error', __('Image crop failed.'), $this->file );
+		return new WP_Error('image_crop_error', __('Image crop failed.'), $this->file);
 	}
 
 	/**
@@ -315,21 +315,21 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
-		if ( function_exists('imagerotate') ) {
-			$transparency = imagecolorallocatealpha( $this->image, 255, 255, 255, 127 );
-			$rotated = imagerotate( $this->image, $angle, $transparency );
-
-			if ( is_resource( $rotated ) ) {
-				imagealphablending( $rotated, true );
-				imagesavealpha( $rotated, true );
-				imagedestroy( $this->image );
+	public function rotate($angle) {
+		if (function_exists('imagerotate')) {
+			$transparency = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
+			$rotated = imagerotate($this->image, $angle, $transparency);
+
+			if (is_resource($rotated)) {
+				imagealphablending($rotated, true);
+				imagesavealpha($rotated, true);
+				imagedestroy($this->image);
 				$this->image = $rotated;
 				$this->update_size();
 				return true;
 			}
 		}
-		return new WP_Error( 'image_rotate_error', __('Image rotate failed.'), $this->file );
+		return new WP_Error('image_rotate_error', __('Image rotate failed.'), $this->file);
 	}
 
 	/**
@@ -342,24 +342,24 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		$w = $this->size['width'];
 		$h = $this->size['height'];
-		$dst = wp_imagecreatetruecolor( $w, $h );
+		$dst = wp_imagecreatetruecolor($w, $h);
 
-		if ( is_resource( $dst ) ) {
+		if (is_resource($dst)) {
 			$sx = $vert ? ($w - 1) : 0;
 			$sy = $horz ? ($h - 1) : 0;
 			$sw = $vert ? -$w : $w;
 			$sh = $horz ? -$h : $h;
 
-			if ( imagecopyresampled( $dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
-				imagedestroy( $this->image );
+			if (imagecopyresampled($dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
+				imagedestroy($this->image);
 				$this->image = $dst;
 				return true;
 			}
 		}
-		return new WP_Error( 'image_flip_error', __('Image flip failed.'), $this->file );
+		return new WP_Error('image_flip_error', __('Image flip failed.'), $this->file);
 	}
 
 	/**
@@ -372,10 +372,10 @@ 
 	 * @param string|null $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $filename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $filename, $mime_type );
+	public function save($filename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $filename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 		}
@@ -389,36 +389,36 @@ 
 	 * @param string|null $mime_type
 	 * @return WP_Error|array
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
-		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+		if ('image/gif' == $mime_type) {
+			if ( ! $this->make_image($filename, 'imagegif', array($image, $filename)))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
-		elseif ( 'image/png' == $mime_type ) {
+		elseif ('image/png' == $mime_type) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
-				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			if (function_exists('imageistruecolor') && ! imageistruecolor($image))
+				imagetruecolortopalette($image, false, imagecolorstotal($image));
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			if ( ! $this->make_image($filename, 'imagepng', array($image, $filename)))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+		elseif ('image/jpeg' == $mime_type) {
+			if ( ! $this->make_image($filename, 'imagejpeg', array($image, $filename, $this->get_quality())))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
 		else {
-			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/**
 		 * Filters the name of the saved image file.
@@ -429,7 +429,7 @@ 
 		 */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -445,19 +445,19 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $this->image );
+				header('Content-Type: image/png');
+				return imagepng($this->image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $this->image );
+				header('Content-Type: image/gif');
+				return imagegif($this->image);
 			default:
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $this->image, null, $this->get_quality() );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($this->image, null, $this->get_quality());
 		}
 	}
 
@@ -472,10 +472,10 @@ 
 	 * @param array $arguments
 	 * @return bool
 	 */
-	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
+	protected function make_image($filename, $function, $arguments) {
+		if (wp_is_stream($filename))
 			$arguments[1] = null;
 
-		return parent::make_image( $filename, $function, $arguments );
+		return parent::make_image($filename, $function, $arguments);
 	}
 }

src/wp-includes/feed-rdf.php

Braces +5 added lines, -2 removed lines

@@ -68,10 +68,13 @@
 	<?php the_category_rss('rdf') ?>
 <?php if (get_option('rss_use_excerpt')) : ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php else : ?>
+<?php else {
+	: ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 	/**
 	 * Fires at the end of each RDF feed item.

Spacing +10 added lines, -10 removed lines

@@ -5,13 +5,13 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('rdf').'; charset='.get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
-do_action( 'rss_tag_pre', 'rdf' );
+do_action('rss_tag_pre', 'rdf');
 ?>
 <rdf:RDF
 	xmlns="http://purl.org/rss/1.0/"
@@ -26,7 +26,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_ns' );
+	do_action('rdf_ns');
 	?>
 >
 <channel rdf:about="<?php bloginfo_rss("url") ?>">
@@ -34,16 +34,16 @@ 
 	<link><?php bloginfo_rss('url') ?></link>
 	<description><?php bloginfo_rss('description') ?></description>
 	<dc:date><?php
-		$date = get_lastpostmodified( 'GMT' );
-		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date ) : date( 'Y-m-d\TH:i:s\Z' );
+		$date = get_lastpostmodified('GMT');
+		echo $date ? mysql2date('Y-m-d\TH:i:s\Z', $date) : date('Y-m-d\TH:i:s\Z');
 	?></dc:date>
 	<sy:updatePeriod><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_period', 'hourly' );
+		echo apply_filters('rss_update_period', 'hourly');
 	?></sy:updatePeriod>
 	<sy:updateFrequency><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_frequency', '1' );
+		echo apply_filters('rss_update_frequency', '1');
 	?></sy:updateFrequency>
 	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
 	<?php
@@ -52,7 +52,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_header' );
+	do_action('rdf_header');
 	?>
 	<items>
 		<rdf:Seq>
@@ -81,8 +81,8 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_item' );
+	do_action('rdf_item');
 	?>
 </item>
-<?php endwhile;  ?>
+<?php endwhile; ?>
 </rdf:RDF>