ntwb / wordpress

src/wp-includes/class-wp-admin-bar.php

Spacing +178 added lines, -178 removed lines

@@ -21,13 +21,13 @@ 
 	 * @param string $name
 	 * @return string|array|void
 	 */
-	public function __get( $name ) {
-		switch ( $name ) {
+	public function __get($name) {
+		switch ($name) {
 			case 'proto' :
 				return is_ssl() ? 'https://' : 'http://';
 
 			case 'menu' :
-				_deprecated_argument( 'WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
+				_deprecated_argument('WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.');
 				return array(); // Sorry, folks.
 		}
 	}
@@ -38,61 +38,61 @@ 
 	public function initialize() {
 		$this->user = new stdClass;
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			/* Populate settings we need for the menu based on the current user. */
-			$this->user->blogs = get_blogs_of_user( get_current_user_id() );
-			if ( is_multisite() ) {
-				$this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-				$this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+			$this->user->blogs = get_blogs_of_user(get_current_user_id());
+			if (is_multisite()) {
+				$this->user->active_blog = get_active_blog_for_user(get_current_user_id());
+				$this->user->domain = empty($this->user->active_blog) ? user_admin_url() : trailingslashit(get_home_url($this->user->active_blog->blog_id));
 				$this->user->account_domain = $this->user->domain;
 			} else {
 				$this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-				$this->user->domain = trailingslashit( home_url() );
+				$this->user->domain = trailingslashit(home_url());
 				$this->user->account_domain = $this->user->domain;
 			}
 		}
 
-		add_action( 'wp_head', 'wp_admin_bar_header' );
+		add_action('wp_head', 'wp_admin_bar_header');
 
-		add_action( 'admin_head', 'wp_admin_bar_header' );
+		add_action('admin_head', 'wp_admin_bar_header');
 
-		if ( current_theme_supports( 'admin-bar' ) ) {
+		if (current_theme_supports('admin-bar')) {
 			/**
 			 * To remove the default padding styles from WordPress for the Toolbar, use the following code:
 			 * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
 			 */
-			$admin_bar_args = get_theme_support( 'admin-bar' );
+			$admin_bar_args = get_theme_support('admin-bar');
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
+		if (empty($header_callback))
 			$header_callback = '_admin_bar_bump_cb';
 
 		add_action('wp_head', $header_callback);
 
-		wp_enqueue_script( 'admin-bar' );
-		wp_enqueue_style( 'admin-bar' );
+		wp_enqueue_script('admin-bar');
+		wp_enqueue_style('admin-bar');
 
 		/**
 		 * Fires after WP_Admin_Bar is initialized.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'admin_bar_init' );
+		do_action('admin_bar_init');
 	}
 
 	/**
 	 * @param array $node
 	 */
-	public function add_menu( $node ) {
-		$this->add_node( $node );
+	public function add_menu($node) {
+		$this->add_node($node);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	public function remove_menu( $id ) {
-		$this->remove_node( $id );
+	public function remove_menu($id) {
+		$this->remove_node($id);
 	}
 
 	/**
@@ -114,22 +114,22 @@ 
 	 *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
 	 * }
 	 */
-	public function add_node( $args ) {
+	public function add_node($args) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if (func_num_args() >= 3 && is_string(func_get_arg(0)))
+			$args = array_merge(array('parent' => func_get_arg(0)), func_get_arg(2));
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if (is_object($args))
+			$args = get_object_vars($args);
 
 		// Ensure we have a valid title.
-		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
+		if (empty($args['id'])) {
+			if (empty($args['title']))
 				return;
 
-			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3.0' );
+			_doing_it_wrong(__METHOD__, __('The menu ID should not be empty.'), '3.3.0');
 			// Deprecated: Generate an ID from the title.
-			$args['id'] = esc_attr( sanitize_title( trim( $args['title'] ) ) );
+			$args['id'] = esc_attr(sanitize_title(trim($args['title'])));
 		}
 
 		$defaults = array(
@@ -142,34 +142,34 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ($maybe_defaults = $this->get_node($args['id']))
+			$defaults = get_object_vars($maybe_defaults);
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty($defaults['meta']) && ! empty($args['meta']))
+			$args['meta'] = wp_parse_args($args['meta'], $defaults['meta']);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$back_compat_parents = array(
-			'my-account-with-avatar' => array( 'my-account', '3.3' ),
-			'my-blogs'               => array( 'my-sites',   '3.3' ),
+			'my-account-with-avatar' => array('my-account', '3.3'),
+			'my-blogs'               => array('my-sites', '3.3'),
 		);
 
-		if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
-			list( $new_parent, $version ) = $back_compat_parents[ $args['parent'] ];
-			_deprecated_argument( __METHOD__, $version, sprintf( 'Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent'] ) );
+		if (isset($back_compat_parents[$args['parent']])) {
+			list($new_parent, $version) = $back_compat_parents[$args['parent']];
+			_deprecated_argument(__METHOD__, $version, sprintf('Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent']));
 			$args['parent'] = $new_parent;
 		}
 
-		$this->_set_node( $args );
+		$this->_set_node($args);
 	}
 
 	/**
 	 * @param array $args
 	 */
-	final protected function _set_node( $args ) {
-		$this->nodes[ $args['id'] ] = (object) $args;
+	final protected function _set_node($args) {
+		$this->nodes[$args['id']] = (object) $args;
 	}
 
 	/**
@@ -178,8 +178,8 @@ 
 	 * @param string $id
 	 * @return object Node.
 	 */
-	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
+	final public function get_node($id) {
+		if ($node = $this->_get_node($id))
 			return clone $node;
 	}
 
@@ -187,25 +187,25 @@ 
 	 * @param string $id
 	 * @return object|void
 	 */
-	final protected function _get_node( $id ) {
-		if ( $this->bound )
+	final protected function _get_node($id) {
+		if ($this->bound)
 			return;
 
-		if ( empty( $id ) )
+		if (empty($id))
 			$id = 'root';
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if (isset($this->nodes[$id]))
+			return $this->nodes[$id];
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
+		if ( ! $nodes = $this->_get_nodes())
 			return;
 
-		foreach ( $nodes as &$node ) {
+		foreach ($nodes as &$node) {
 			$node = clone $node;
 		}
 		return $nodes;
@@ -215,7 +215,7 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		return $this->nodes;
@@ -235,10 +235,10 @@ 
 	 *                         'class', 'onclick', 'target', and 'title'.
 	 * }
 	 */
-	final public function add_group( $args ) {
+	final public function add_group($args) {
 		$args['group'] = true;
 
-		$this->add_node( $args );
+		$this->add_node($args);
 	}
 
 	/**
@@ -246,15 +246,15 @@ 
 	 *
 	 * @param string $id The ID of the item.
 	 */
-	public function remove_node( $id ) {
-		$this->_unset_node( $id );
+	public function remove_node($id) {
+		$this->_unset_node($id);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	final protected function _unset_node( $id ) {
-		unset( $this->nodes[ $id ] );
+	final protected function _unset_node($id) {
+		unset($this->nodes[$id]);
 	}
 
 	/**
@@ -262,66 +262,66 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ($root)
+			$this->_render($root);
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
-		$this->remove_node( 'root' );
-		$this->add_node( array(
+		$this->remove_node('root');
+		$this->add_node(array(
 			'id'    => 'root',
 			'group' => false,
-		) );
+		));
 
 		// Normalize nodes: define internal 'children' and 'type' properties.
-		foreach ( $this->_get_nodes() as $node ) {
+		foreach ($this->_get_nodes() as $node) {
 			$node->children = array();
-			$node->type = ( $node->group ) ? 'group' : 'item';
-			unset( $node->group );
+			$node->type = ($node->group) ? 'group' : 'item';
+			unset($node->group);
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
+			if ( ! $node->parent)
 				$node->parent = 'root';
 		}
 
-		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
+		foreach ($this->_get_nodes() as $node) {
+			if ('root' == $node->id)
 				continue;
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
-			if ( ! $parent = $this->_get_node( $node->parent ) ) {
+			if ( ! $parent = $this->_get_node($node->parent)) {
 				continue;
 			}
 
 			// Generate the group class (we distinguish between top level and other level groups).
-			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
+			$group_class = ($node->parent == 'root') ? 'ab-top-menu' : 'ab-submenu';
 
-			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
+			if ($node->type == 'group') {
+				if (empty($node->meta['class']))
 					$node->meta['class'] = $group_class;
 				else
-					$node->meta['class'] .= ' ' . $group_class;
+					$node->meta['class'] .= ' '.$group_class;
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
-			if ( $parent->type == 'item' && $node->type == 'item' ) {
-				$default_id = $parent->id . '-default';
-				$default    = $this->_get_node( $default_id );
+			if ($parent->type == 'item' && $node->type == 'item') {
+				$default_id = $parent->id.'-default';
+				$default    = $this->_get_node($default_id);
 
 				// The default group is added here to allow groups that are
 				// added before standard menu items to render first.
-				if ( ! $default ) {
+				if ( ! $default) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'        => $default_id,
 						'parent'    => $parent->id,
 						'type'      => 'group',
@@ -331,45 +331,45 @@ 
 						),
 						'title'     => false,
 						'href'      => false,
-					) );
-					$default = $this->_get_node( $default_id );
+					));
+					$default = $this->_get_node($default_id);
 					$parent->children[] = $default;
 				}
 				$parent = $default;
 
 			// Groups in groups aren't allowed. Add a special 'container' node.
 			// The container will invisibly wrap both groups.
-			} elseif ( $parent->type == 'group' && $node->type == 'group' ) {
-				$container_id = $parent->id . '-container';
-				$container    = $this->_get_node( $container_id );
+			} elseif ($parent->type == 'group' && $node->type == 'group') {
+				$container_id = $parent->id.'-container';
+				$container    = $this->_get_node($container_id);
 
 				// We need to create a container for this group, life is sad.
-				if ( ! $container ) {
+				if ( ! $container) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'       => $container_id,
 						'type'     => 'container',
-						'children' => array( $parent ),
+						'children' => array($parent),
 						'parent'   => false,
 						'title'    => false,
 						'href'     => false,
 						'meta'     => array(),
-					) );
+					));
 
-					$container = $this->_get_node( $container_id );
+					$container = $this->_get_node($container_id);
 
 					// Link the container node if a grandparent node exists.
-					$grandparent = $this->_get_node( $parent->parent );
+					$grandparent = $this->_get_node($parent->parent);
 
-					if ( $grandparent ) {
+					if ($grandparent) {
 						$container->parent = $grandparent->id;
 
-						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
+						$index = array_search($parent, $grandparent->children, true);
+						if ($index === false)
 							$grandparent->children[] = $container;
 						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+							array_splice($grandparent->children, $index, 1, array($container));
 					}
 
 					$parent->parent = $container->id;
@@ -385,7 +385,7 @@ 
 			$parent->children[] = $node;
 		}
 
-		$root = $this->_get_node( 'root' );
+		$root = $this->_get_node('root');
 		$this->bound = true;
 		return $root;
 	}
@@ -395,35 +395,35 @@ 
 	 * @global bool $is_IE
 	 * @param object $root
 	 */
-	final protected function _render( $root ) {
+	final protected function _render($root) {
 		global $is_IE;
 
 		// Add browser classes.
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
-		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+		if ($is_IE) {
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7'))
 				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8'))
 				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 9'))
 				$class .= ' ie9';
-		} elseif ( wp_is_mobile() ) {
+		} elseif (wp_is_mobile()) {
 			$class .= ' mobile';
 		}
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>">
-			<?php if ( ! is_admin() ) { ?>
-				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+			<?php if ( ! is_admin()) { ?>
+				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
 			<?php } ?>
-			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
-				<?php foreach ( $root->children as $group ) {
-					$this->_render_group( $group );
+			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Toolbar'); ?>" tabindex="0">
+				<?php foreach ($root->children as $group) {
+					$this->_render_group($group);
 				} ?>
 			</div>
-			<?php if ( is_user_logged_in() ) : ?>
-			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
+			<?php if (is_user_logged_in()) : ?>
+			<a class="screen-reader-shortcut" href="<?php echo esc_url(wp_logout_url()); ?>"><?php _e('Log Out'); ?></a>
 			<?php endif; ?>
 		</div>
 
@@ -433,13 +433,13 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
+	final protected function _render_container($node) {
+		if ($node->type != 'container' || empty($node->children))
 			return;
 
-		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
-			foreach ( $node->children as $group ) {
-				$this->_render_group( $group );
+		?><div id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>" class="ab-group-container"><?php
+			foreach ($node->children as $group) {
+				$this->_render_group($group);
 			}
 		?></div><?php
 	}
@@ -447,22 +447,22 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_group( $node ) {
-		if ( $node->type == 'container' ) {
-			$this->_render_container( $node );
+	final protected function _render_group($node) {
+		if ($node->type == 'container') {
+			$this->_render_container($node);
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
+		if ($node->type != 'group' || empty($node->children))
 			return;
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		if ( ! empty($node->meta['class']))
+			$class = ' class="'.esc_attr(trim($node->meta['class'])).'"';
 		else
 			$class = '';
 
-		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
-			foreach ( $node->children as $item ) {
-				$this->_render_item( $item );
+		?><ul id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $class; ?>><?php
+			foreach ($node->children as $item) {
+				$this->_render_item($item);
 			}
 		?></ul><?php
 	}
@@ -470,85 +470,85 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
+	final protected function _render_item($node) {
+		if ($node->type != 'item')
 			return;
 
-		$is_parent = ! empty( $node->children );
-		$has_link  = ! empty( $node->href );
+		$is_parent = ! empty($node->children);
+		$has_link  = ! empty($node->href);
 
 		// Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y.
-		$tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
-		$aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
+		$tabindex = (isset($node->meta['tabindex']) && is_numeric($node->meta['tabindex'])) ? (int) $node->meta['tabindex'] : '';
+		$aria_attributes = ('' !== $tabindex) ? ' tabindex="'.$tabindex.'"' : '';
 
 		$menuclass = '';
 
-		if ( $is_parent ) {
+		if ($is_parent) {
 			$menuclass = 'menupop ';
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty($node->meta['class']))
 			$menuclass .= $node->meta['class'];
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ($menuclass)
+			$menuclass = ' class="'.esc_attr(trim($menuclass)).'"';
 
 		?>
 
-		<li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
-			if ( $has_link ):
-				?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
-					if ( ! empty( $node->meta['onclick'] ) ) :
-						?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+		<li id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $menuclass; ?>><?php
+			if ($has_link):
+				?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url($node->href) ?>"<?php
+					if ( ! empty($node->meta['onclick'])) :
+						?> onclick="<?php echo esc_js($node->meta['onclick']); ?>"<?php
 					endif;
-				if ( ! empty( $node->meta['target'] ) ) :
-					?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+				if ( ! empty($node->meta['target'])) :
+					?> target="<?php echo esc_attr($node->meta['target']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['rel'] ) ) :
-					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+				if ( ! empty($node->meta['rel'])) :
+					?> rel="<?php echo esc_attr($node->meta['rel']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			else:
 				?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			endif;
 
 			echo $node->title;
 
-			if ( $has_link ) :
+			if ($has_link) :
 				?></a><?php
 			else:
 				?></div><?php
 			endif;
 
-			if ( $is_parent ) :
+			if ($is_parent) :
 				?><div class="ab-sub-wrapper"><?php
-					foreach ( $node->children as $group ) {
-						$this->_render_group( $group );
+					foreach ($node->children as $group) {
+						$this->_render_group($group);
 					}
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
+			if ( ! empty($node->meta['html']))
 				echo $node->meta['html'];
 
 			?>
@@ -559,9 +559,9 @@ 
 	 * @param string $id    Unused.
 	 * @param object $node
 	 */
-	public function recursive_render( $id, $node ) {
-		_deprecated_function( __METHOD__, '3.3.0', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
-		$this->_render_item( $node );
+	public function recursive_render($id, $node) {
+		_deprecated_function(__METHOD__, '3.3.0', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()');
+		$this->_render_item($node);
 	}
 
 	/**
@@ -569,32 +569,32 @@ 
 	 */
 	public function add_menus() {
 		// User related, aligned right.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_menu', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_search_menu', 4);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_item', 7);
 
 		// Site related.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
+		add_action('admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_wp_menu', 10);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20);
+		add_action('admin_bar_menu', 'wp_admin_bar_site_menu', 30);
+		add_action('admin_bar_menu', 'wp_admin_bar_customize_menu', 40);
+		add_action('admin_bar_menu', 'wp_admin_bar_updates_menu', 50);
 
 		// Content related.
-		if ( ! is_network_admin() && ! is_user_admin() ) {
-			add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
-			add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+		if ( ! is_network_admin() && ! is_user_admin()) {
+			add_action('admin_bar_menu', 'wp_admin_bar_comments_menu', 60);
+			add_action('admin_bar_menu', 'wp_admin_bar_new_content_menu', 70);
 		}
-		add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		add_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 
-		add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
+		add_action('admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200);
 
 		/**
 		 * Fires after menus are added to the menu bar.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'add_admin_bar_menus' );
+		do_action('add_admin_bar_menus');
 	}
 }

src/wp-includes/embed-template.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  * @deprecated 4.5.0 Moved to wp-includes/theme-compat/embed.php
  */
 
-_deprecated_file( basename( __FILE__ ), '4.5.0', 'wp-includes/theme-compat/embed.php' );
+_deprecated_file(basename(__FILE__), '4.5.0', 'wp-includes/theme-compat/embed.php');
 
-include( ABSPATH . WPINC . '/theme-compat/embed.php' );
+include(ABSPATH.WPINC.'/theme-compat/embed.php');

src/wp-includes/media.php

Spacing +899 added lines, -899 removed lines

@@ -38,39 +38,39 @@ 
  *                              (like inserting into an editor). Default null.
  * @return array Width and height of what the result image should resize to.
  */
-function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
+function image_constrain_size_for_editor($width, $height, $size = 'medium', $context = null) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	if ( ! $context )
+	if ( ! $context)
 		$context = is_admin() ? 'edit' : 'display';
 
-	if ( is_array($size) ) {
+	if (is_array($size)) {
 		$max_width = $size[0];
 		$max_height = $size[1];
 	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	elseif ($size == 'thumb' || $size == 'thumbnail') {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
-		if ( !$max_width && !$max_height ) {
+		if ( ! $max_width && ! $max_height) {
 			$max_width = 128;
 			$max_height = 96;
 		}
 	}
-	elseif ( $size == 'medium' ) {
+	elseif ($size == 'medium') {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 
 	}
-	elseif ( $size == 'medium_large' ) {
-		$max_width = intval( get_option( 'medium_large_size_w' ) );
-		$max_height = intval( get_option( 'medium_large_size_h' ) );
+	elseif ($size == 'medium_large') {
+		$max_width = intval(get_option('medium_large_size_w'));
+		$max_height = intval(get_option('medium_large_size_h'));
 
-		if ( intval( $content_width ) > 0 ) {
-			$max_width = min( intval( $content_width ), $max_width );
+		if (intval($content_width) > 0) {
+			$max_width = min(intval($content_width), $max_width);
 		}
 	}
-	elseif ( $size == 'large' ) {
+	elseif ($size == 'large') {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -79,14 +79,14 @@ 
 		 */
 		$max_width = intval(get_option('large_size_w'));
 		$max_height = intval(get_option('large_size_h'));
-		if ( intval($content_width) > 0 ) {
-			$max_width = min( intval($content_width), $max_width );
+		if (intval($content_width) > 0) {
+			$max_width = min(intval($content_width), $max_width);
 		}
-	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
-		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
-		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
-			$max_width = min( intval($content_width), $max_width );
+	} elseif (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes) && in_array($size, array_keys($_wp_additional_image_sizes))) {
+		$max_width = intval($_wp_additional_image_sizes[$size]['width']);
+		$max_height = intval($_wp_additional_image_sizes[$size]['height']);
+		if (intval($content_width) > 0 && 'edit' == $context) // Only in admin. Assume that theme authors know what they're doing.
+			$max_width = min(intval($content_width), $max_width);
 	}
 	// $size == 'full' has no constraint
 	else {
@@ -106,9 +106,9 @@ 
 	 *                                     Possible values are 'display' (like in a theme)
 	 *                                     or 'edit' (like inserting into an editor).
 	 */
-	list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size, $context );
+	list($max_width, $max_height) = apply_filters('editor_max_image_size', array($max_width, $max_height), $size, $context);
 
-	return wp_constrain_dimensions( $width, $height, $max_width, $max_height );
+	return wp_constrain_dimensions($width, $height, $max_width, $max_height);
 }
 
 /**
@@ -128,7 +128,7 @@ 
  * @param int|string $height Image height in pixels.
  * @return string HTML attributes for width and, or height.
  */
-function image_hwstring( $width, $height ) {
+function image_hwstring($width, $height) {
 	$out = '';
 	if ($width)
 		$out .= 'width="'.intval($width).'" ';
@@ -162,9 +162,9 @@ 
  * @return false|array Array containing the image URL, width, height, and boolean for whether
  *                     the image is an intermediate size. False on failure.
  */
-function image_downsize( $id, $size = 'medium' ) {
+function image_downsize($id, $size = 'medium') {
 
-	if ( !wp_attachment_is_image($id) )
+	if ( ! wp_attachment_is_image($id))
 		return false;
 
 	/**
@@ -180,7 +180,7 @@ 
 	 * @param array|string $size     Size of image. Image size or array of width and height values (in that order).
 	 *                               Default 'medium'.
 	 */
-	if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) {
+	if ($out = apply_filters('image_downsize', false, $id, $size)) {
 		return $out;
 	}
 
@@ -191,32 +191,32 @@ 
 	$img_url_basename = wp_basename($img_url);
 
 	// try for a new style intermediate size
-	if ( $intermediate = image_get_intermediate_size($id, $size) ) {
+	if ($intermediate = image_get_intermediate_size($id, $size)) {
 		$img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
 	}
-	elseif ( $size == 'thumbnail' ) {
+	elseif ($size == 'thumbnail') {
 		// fall back to the old thumbnail
-		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
+		if (($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file)) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
 			$width = $info[0];
 			$height = $info[1];
 			$is_intermediate = true;
 		}
 	}
-	if ( !$width && !$height && isset( $meta['width'], $meta['height'] ) ) {
+	if ( ! $width && ! $height && isset($meta['width'], $meta['height'])) {
 		// any other type: use the real image
 		$width = $meta['width'];
 		$height = $meta['height'];
 	}
 
-	if ( $img_url) {
+	if ($img_url) {
 		// we have the actual image size, but might need to further constrain it if content_width is narrower
-		list( $width, $height ) = image_constrain_size_for_editor( $width, $height, $size );
+		list($width, $height) = image_constrain_size_for_editor($width, $height, $size);
 
-		return array( $img_url, $width, $height, $is_intermediate );
+		return array($img_url, $width, $height, $is_intermediate);
 	}
 	return false;
 
@@ -243,12 +243,12 @@ 
  * @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
-function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
+function add_image_size($name, $width = 0, $height = 0, $crop = false) {
 	global $_wp_additional_image_sizes;
 
-	$_wp_additional_image_sizes[ $name ] = array(
-		'width'  => absint( $width ),
-		'height' => absint( $height ),
+	$_wp_additional_image_sizes[$name] = array(
+		'width'  => absint($width),
+		'height' => absint($height),
 		'crop'   => $crop,
 	);
 }
@@ -263,10 +263,10 @@ 
  * @param string $name The image size to check.
  * @return bool True if the image size exists, false if not.
  */
-function has_image_size( $name ) {
+function has_image_size($name) {
 	global $_wp_additional_image_sizes;
 
-	return isset( $_wp_additional_image_sizes[ $name ] );
+	return isset($_wp_additional_image_sizes[$name]);
 }
 
 /**
@@ -279,11 +279,11 @@ 
  * @param string $name The image size to remove.
  * @return bool True if the image size was successfully removed, false on failure.
  */
-function remove_image_size( $name ) {
+function remove_image_size($name) {
 	global $_wp_additional_image_sizes;
 
-	if ( isset( $_wp_additional_image_sizes[ $name ] ) ) {
-		unset( $_wp_additional_image_sizes[ $name ] );
+	if (isset($_wp_additional_image_sizes[$name])) {
+		unset($_wp_additional_image_sizes[$name]);
 		return true;
 	}
 
@@ -302,8 +302,8 @@ 
  * @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
-function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
-	add_image_size( 'post-thumbnail', $width, $height, $crop );
+function set_post_thumbnail_size($width = 0, $height = 0, $crop = false) {
+	add_image_size('post-thumbnail', $width, $height, $crop);
 }
 
 /**
@@ -329,14 +329,14 @@ 
  *                            (in that order). Default 'medium'.
  * @return string HTML IMG element for given image attachment
  */
-function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
+function get_image_tag($id, $alt, $title, $align, $size = 'medium') {
 
-	list( $img_src, $width, $height ) = image_downsize($id, $size);
+	list($img_src, $width, $height) = image_downsize($id, $size);
 	$hwstring = image_hwstring($width, $height);
 
-	$title = $title ? 'title="' . esc_attr( $title ) . '" ' : '';
+	$title = $title ? 'title="'.esc_attr($title).'" ' : '';
 
-	$class = 'align' . esc_attr($align) .' size-' . esc_attr($size) . ' wp-image-' . $id;
+	$class = 'align'.esc_attr($align).' size-'.esc_attr($size).' wp-image-'.$id;
 
 	/**
 	 * Filters the value of the attachment's image tag class attribute.
@@ -349,9 +349,9 @@ 
 	 * @param string|array $size  Size of image. Image size or array of width and height values (in that order).
 	 *                            Default 'medium'.
 	 */
-	$class = apply_filters( 'get_image_tag_class', $class, $id, $align, $size );
+	$class = apply_filters('get_image_tag_class', $class, $id, $align, $size);
 
-	$html = '<img src="' . esc_attr($img_src) . '" alt="' . esc_attr($alt) . '" ' . $title . $hwstring . 'class="' . $class . '" />';
+	$html = '<img src="'.esc_attr($img_src).'" alt="'.esc_attr($alt).'" '.$title.$hwstring.'class="'.$class.'" />';
 
 	/**
 	 * Filters the HTML content for the image tag.
@@ -366,7 +366,7 @@ 
 	 * @param string|array $size  Size of image. Image size or array of width and height values (in that order).
 	 *                            Default 'medium'.
 	 */
-	return apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size );
+	return apply_filters('get_image_tag', $html, $id, $alt, $title, $align, $size);
 }
 
 /**
@@ -383,28 +383,28 @@ 
  * @param int $max_height     Optional. Max height in pixels to constrain to. Default 0.
  * @return array First item is the width, the second item is the height.
  */
-function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+function wp_constrain_dimensions($current_width, $current_height, $max_width = 0, $max_height = 0) {
+	if ( ! $max_width && ! $max_height)
+		return array($current_width, $current_height);
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
 
-	if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
+	if ($max_width > 0 && $current_width > 0 && $current_width > $max_width) {
 		$width_ratio = $max_width / $current_width;
 		$did_width = true;
 	}
 
-	if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height ) {
+	if ($max_height > 0 && $current_height > 0 && $current_height > $max_height) {
 		$height_ratio = $max_height / $current_height;
 		$did_height = true;
 	}
 
 	// Calculate the larger/smaller ratios
-	$smaller_ratio = min( $width_ratio, $height_ratio );
-	$larger_ratio  = max( $width_ratio, $height_ratio );
+	$smaller_ratio = min($width_ratio, $height_ratio);
+	$larger_ratio  = max($width_ratio, $height_ratio);
 
-	if ( (int) round( $current_width * $larger_ratio ) > $max_width || (int) round( $current_height * $larger_ratio ) > $max_height ) {
+	if ((int) round($current_width * $larger_ratio) > $max_width || (int) round($current_height * $larger_ratio) > $max_height) {
  		// The larger ratio is too big. It would result in an overflow.
 		$ratio = $smaller_ratio;
 	} else {
@@ -413,20 +413,20 @@ 
 	}
 
 	// Very small dimensions may result in 0, 1 should be the minimum.
-	$w = max ( 1, (int) round( $current_width  * $ratio ) );
-	$h = max ( 1, (int) round( $current_height * $ratio ) );
+	$w = max(1, (int) round($current_width * $ratio));
+	$h = max(1, (int) round($current_height * $ratio));
 
 	// Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
 	// We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.
 	// Thus we look for dimensions that are one pixel shy of the max value and bump them up
 
 	// Note: $did_width means it is possible $smaller_ratio == $width_ratio.
-	if ( $did_width && $w == $max_width - 1 ) {
+	if ($did_width && $w == $max_width - 1) {
 		$w = $max_width; // Round it up
 	}
 
 	// Note: $did_height means it is possible $smaller_ratio == $height_ratio.
-	if ( $did_height && $h == $max_height - 1 ) {
+	if ($did_height && $h == $max_height - 1) {
 		$h = $max_height; // Round it up
 	}
 
@@ -441,7 +441,7 @@ 
 	 * @param int 	$max_width      The maximum width permitted.
 	 * @param int 	$max_height     The maximum height permitted.
 	 */
-	return apply_filters( 'wp_constrain_dimensions', array( $w, $h ), $current_width, $current_height, $max_width, $max_height );
+	return apply_filters('wp_constrain_dimensions', array($w, $h), $current_width, $current_height, $max_width, $max_height);
 }
 
 /**
@@ -468,7 +468,7 @@ 
  *                           An array can specify positioning of the crop area. Default false.
  * @return false|array False on failure. Returned array matches parameters for `imagecopyresampled()`.
  */
-function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
+function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
 
 	if ($orig_w <= 0 || $orig_h <= 0)
 		return false;
@@ -492,22 +492,22 @@ 
 	 * @param bool|array $crop   Whether to crop image to specified width and height or resize.
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
-	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
+	$output = apply_filters('image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop);
+	if (null !== $output)
 		return $output;
 
-	if ( $crop ) {
+	if ($crop) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
 		$aspect_ratio = $orig_w / $orig_h;
 		$new_w = min($dest_w, $orig_w);
 		$new_h = min($dest_h, $orig_h);
 
-		if ( ! $new_w ) {
-			$new_w = (int) round( $new_h * $aspect_ratio );
+		if ( ! $new_w) {
+			$new_w = (int) round($new_h * $aspect_ratio);
 		}
 
-		if ( ! $new_h ) {
-			$new_h = (int) round( $new_w / $aspect_ratio );
+		if ( ! $new_h) {
+			$new_h = (int) round($new_w / $aspect_ratio);
 		}
 
 		$size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
@@ -515,26 +515,26 @@ 
 		$crop_w = round($new_w / $size_ratio);
 		$crop_h = round($new_h / $size_ratio);
 
-		if ( ! is_array( $crop ) || count( $crop ) !== 2 ) {
-			$crop = array( 'center', 'center' );
+		if ( ! is_array($crop) || count($crop) !== 2) {
+			$crop = array('center', 'center');
 		}
 
-		list( $x, $y ) = $crop;
+		list($x, $y) = $crop;
 
-		if ( 'left' === $x ) {
+		if ('left' === $x) {
 			$s_x = 0;
-		} elseif ( 'right' === $x ) {
+		} elseif ('right' === $x) {
 			$s_x = $orig_w - $crop_w;
 		} else {
-			$s_x = floor( ( $orig_w - $crop_w ) / 2 );
+			$s_x = floor(($orig_w - $crop_w) / 2);
 		}
 
-		if ( 'top' === $y ) {
+		if ('top' === $y) {
 			$s_y = 0;
-		} elseif ( 'bottom' === $y ) {
+		} elseif ('bottom' === $y) {
 			$s_y = $orig_h - $crop_h;
 		} else {
-			$s_y = floor( ( $orig_h - $crop_h ) / 2 );
+			$s_y = floor(($orig_h - $crop_h) / 2);
 		}
 	} else {
 		// don't crop, just resize using $dest_w x $dest_h as a maximum bounding box
@@ -544,17 +544,17 @@ 
 		$s_x = 0;
 		$s_y = 0;
 
-		list( $new_w, $new_h ) = wp_constrain_dimensions( $orig_w, $orig_h, $dest_w, $dest_h );
+		list($new_w, $new_h) = wp_constrain_dimensions($orig_w, $orig_h, $dest_w, $dest_h);
 	}
 
 	// if the resulting image would be the same size or larger we don't want to resize it
-	if ( $new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h ) {
+	if ($new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h) {
 		return false;
 	}
 
 	// the return array matches the parameters to imagecopyresampled()
 	// int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
-	return array( 0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h );
+	return array(0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h);
 
 }
 
@@ -574,17 +574,17 @@ 
  *                       Default false.
  * @return false|array False, if no image was created. Metadata array on success.
  */
-function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
-	if ( $width || $height ) {
-		$editor = wp_get_image_editor( $file );
+function image_make_intermediate_size($file, $width, $height, $crop = false) {
+	if ($width || $height) {
+		$editor = wp_get_image_editor($file);
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
+		if (is_wp_error($editor) || is_wp_error($editor->resize($width, $height, $crop)))
 			return false;
 
 		$resized_file = $editor->save();
 
-		if ( ! is_wp_error( $resized_file ) && $resized_file ) {
-			unset( $resized_file['path'] );
+		if ( ! is_wp_error($resized_file) && $resized_file) {
+			unset($resized_file['path']);
 			return $resized_file;
 		}
 	}
@@ -602,21 +602,21 @@ 
  * @param int $target_height Height of the second image in pixels.
  * @return bool True if aspect ratios match within 1px. False if not.
  */
-function wp_image_matches_ratio( $source_width, $source_height, $target_width, $target_height ) {
+function wp_image_matches_ratio($source_width, $source_height, $target_width, $target_height) {
 	/*
 	 * To test for varying crops, we constrain the dimensions of the larger image
 	 * to the dimensions of the smaller image and see if they match.
 	 */
-	if ( $source_width > $target_width ) {
-		$constrained_size = wp_constrain_dimensions( $source_width, $source_height, $target_width );
-		$expected_size = array( $target_width, $target_height );
+	if ($source_width > $target_width) {
+		$constrained_size = wp_constrain_dimensions($source_width, $source_height, $target_width);
+		$expected_size = array($target_width, $target_height);
 	} else {
-		$constrained_size = wp_constrain_dimensions( $target_width, $target_height, $source_width );
-		$expected_size = array( $source_width, $source_height );
+		$constrained_size = wp_constrain_dimensions($target_width, $target_height, $source_width);
+		$expected_size = array($source_width, $source_height);
 	}
 
 	// If the image dimensions are within 1px of the expected size, we consider it a match.
-	$matched = ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 );
+	$matched = (abs($constrained_size[0] - $expected_size[0]) <= 1 && abs($constrained_size[1] - $expected_size[1]) <= 1);
 
 	return $matched;
 }
@@ -657,74 +657,74 @@ 
  *     @type string $url    Image's URL.
  * }
  */
-function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( ! $size || ! is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) || empty( $imagedata['sizes'] )  ) {
+function image_get_intermediate_size($post_id, $size = 'thumbnail') {
+	if ( ! $size || ! is_array($imagedata = wp_get_attachment_metadata($post_id)) || empty($imagedata['sizes'])) {
 		return false;
 	}
 
 	$data = array();
 
 	// Find the best match when '$size' is an array.
-	if ( is_array( $size ) ) {
+	if (is_array($size)) {
 		$candidates = array();
 
-		foreach ( $imagedata['sizes'] as $_size => $data ) {
+		foreach ($imagedata['sizes'] as $_size => $data) {
 			// If there's an exact match to an existing image size, short circuit.
-			if ( $data['width'] == $size[0] && $data['height'] == $size[1] ) {
-				$candidates[ $data['width'] * $data['height'] ] = $data;
+			if ($data['width'] == $size[0] && $data['height'] == $size[1]) {
+				$candidates[$data['width'] * $data['height']] = $data;
 				break;
 			}
 
 			// If it's not an exact match, consider larger sizes with the same aspect ratio.
-			if ( $data['width'] >= $size[0] && $data['height'] >= $size[1] ) {
+			if ($data['width'] >= $size[0] && $data['height'] >= $size[1]) {
 				// If '0' is passed to either size, we test ratios against the original file.
-				if ( 0 === $size[0] || 0 === $size[1] ) {
-					$same_ratio = wp_image_matches_ratio( $data['width'], $data['height'], $imagedata['width'], $imagedata['height'] );
+				if (0 === $size[0] || 0 === $size[1]) {
+					$same_ratio = wp_image_matches_ratio($data['width'], $data['height'], $imagedata['width'], $imagedata['height']);
 				} else {
-					$same_ratio = wp_image_matches_ratio( $data['width'], $data['height'], $size[0], $size[1] );
+					$same_ratio = wp_image_matches_ratio($data['width'], $data['height'], $size[0], $size[1]);
 				}
 
-				if ( $same_ratio ) {
-					$candidates[ $data['width'] * $data['height'] ] = $data;
+				if ($same_ratio) {
+					$candidates[$data['width'] * $data['height']] = $data;
 				}
 			}
 		}
 
-		if ( ! empty( $candidates ) ) {
+		if ( ! empty($candidates)) {
 			// Sort the array by size if we have more than one candidate.
-			if ( 1 < count( $candidates ) ) {
-				ksort( $candidates );
+			if (1 < count($candidates)) {
+				ksort($candidates);
 			}
 
-			$data = array_shift( $candidates );
+			$data = array_shift($candidates);
 		/*
 		 * When the size requested is smaller than the thumbnail dimensions, we
 		 * fall back to the thumbnail size to maintain backwards compatibility with
 		 * pre 4.6 versions of WordPress.
 		 */
-		} elseif ( ! empty( $imagedata['sizes']['thumbnail'] ) && $imagedata['sizes']['thumbnail']['width'] >= $size[0] && $imagedata['sizes']['thumbnail']['width'] >= $size[1] ) {
+		} elseif ( ! empty($imagedata['sizes']['thumbnail']) && $imagedata['sizes']['thumbnail']['width'] >= $size[0] && $imagedata['sizes']['thumbnail']['width'] >= $size[1]) {
 			$data = $imagedata['sizes']['thumbnail'];
 		} else {
 			return false;
 		}
 
 		// Constrain the width and height attributes to the requested values.
-		list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
+		list($data['width'], $data['height']) = image_constrain_size_for_editor($data['width'], $data['height'], $size);
 
-	} elseif ( ! empty( $imagedata['sizes'][ $size ] ) ) {
-		$data = $imagedata['sizes'][ $size ];
+	} elseif ( ! empty($imagedata['sizes'][$size])) {
+		$data = $imagedata['sizes'][$size];
 	}
 
 	// If we still don't have a match at this point, return false.
-	if ( empty( $data ) ) {
+	if (empty($data)) {
 		return false;
 	}
 
 	// include the full filesystem path of the intermediate file
-	if ( empty($data['path']) && !empty($data['file']) ) {
+	if (empty($data['path']) && ! empty($data['file'])) {
 		$file_url = wp_get_attachment_url($post_id);
-		$data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
-		$data['url'] = path_join( dirname($file_url), $data['file'] );
+		$data['path'] = path_join(dirname($imagedata['file']), $data['file']);
+		$data['url'] = path_join(dirname($file_url), $data['file']);
 	}
 
 	/**
@@ -740,7 +740,7 @@ 
 	 * @param string|array $size    Registered image size or flat array of initially-requested height and width
 	 *                              dimensions (in that order).
 	 */
-	return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size );
+	return apply_filters('image_get_intermediate_size', $data, $post_id, $size);
 }
 
 /**
@@ -755,8 +755,8 @@ 
 function get_intermediate_image_sizes() {
 	global $_wp_additional_image_sizes;
 	$image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	if (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes))
+		$image_sizes = array_merge($image_sizes, array_keys($_wp_additional_image_sizes));
 
 	/**
 	 * Filters the list of intermediate image sizes.
@@ -766,7 +766,7 @@ 
 	 * @param array $image_sizes An array of intermediate image sizes. Defaults
 	 *                           are 'thumbnail', 'medium', 'medium_large', 'large'.
 	 */
-	return apply_filters( 'intermediate_image_sizes', $image_sizes );
+	return apply_filters('intermediate_image_sizes', $image_sizes);
 }
 
 /**
@@ -787,22 +787,22 @@ 
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @return false|array Returns an array (url, width, height, is_intermediate), or false, if no image is available.
  */
-function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {
+function wp_get_attachment_image_src($attachment_id, $size = 'thumbnail', $icon = false) {
 	// get a thumbnail or intermediate image if there is one
-	$image = image_downsize( $attachment_id, $size );
-	if ( ! $image ) {
+	$image = image_downsize($attachment_id, $size);
+	if ( ! $image) {
 		$src = false;
 
-		if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) {
+		if ($icon && $src = wp_mime_type_icon($attachment_id)) {
 			/** This filter is documented in wp-includes/post.php */
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir = apply_filters('icon_dir', ABSPATH.WPINC.'/images/media');
 
-			$src_file = $icon_dir . '/' . wp_basename( $src );
-			@list( $width, $height ) = getimagesize( $src_file );
+			$src_file = $icon_dir.'/'.wp_basename($src);
+			@list($width, $height) = getimagesize($src_file);
 		}
 
-		if ( $src && $width && $height ) {
-			$image = array( $src, $width, $height );
+		if ($src && $width && $height) {
+			$image = array($src, $width, $height);
 		}
 	}
 	/**
@@ -816,7 +816,7 @@ 
 	 *                                    (in that order). Default 'thumbnail'.
 	 * @param bool         $icon          Whether the image should be treated as an icon. Default false.
 	 */
-	return apply_filters( 'wp_get_attachment_image_src', $image, $attachment_id, $size, $icon );
+	return apply_filters('wp_get_attachment_image_src', $image, $attachment_id, $size, $icon);
 }
 
 /**
@@ -839,39 +839,39 @@ 
 function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
 	$html = '';
 	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
-	if ( $image ) {
+	if ($image) {
 		list($src, $width, $height) = $image;
 		$hwstring = image_hwstring($width, $height);
 		$size_class = $size;
-		if ( is_array( $size_class ) ) {
-			$size_class = join( 'x', $size_class );
+		if (is_array($size_class)) {
+			$size_class = join('x', $size_class);
 		}
 		$attachment = get_post($attachment_id);
 		$default_attr = array(
 			'src'	=> $src,
 			'class'	=> "attachment-$size_class size-$size_class",
-			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
+			'alt'	=> trim(strip_tags(get_post_meta($attachment_id, '_wp_attachment_image_alt', true))), // Use Alt field first
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		if (empty($default_attr['alt']))
+			$default_attr['alt'] = trim(strip_tags($attachment->post_excerpt)); // If not, Use the Caption
+		if (empty($default_attr['alt']))
+			$default_attr['alt'] = trim(strip_tags($attachment->post_title)); // Finally, use the title
 
-		$attr = wp_parse_args( $attr, $default_attr );
+		$attr = wp_parse_args($attr, $default_attr);
 
 		// Generate 'srcset' and 'sizes' if not already present.
-		if ( empty( $attr['srcset'] ) ) {
-			$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+		if (empty($attr['srcset'])) {
+			$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 
-			if ( is_array( $image_meta ) ) {
-				$size_array = array( absint( $width ), absint( $height ) );
-				$srcset = wp_calculate_image_srcset( $size_array, $src, $image_meta, $attachment_id );
-				$sizes = wp_calculate_image_sizes( $size_array, $src, $image_meta, $attachment_id );
+			if (is_array($image_meta)) {
+				$size_array = array(absint($width), absint($height));
+				$srcset = wp_calculate_image_srcset($size_array, $src, $image_meta, $attachment_id);
+				$sizes = wp_calculate_image_sizes($size_array, $src, $image_meta, $attachment_id);
 
-				if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) {
+				if ($srcset && ($sizes || ! empty($attr['sizes']))) {
 					$attr['srcset'] = $srcset;
 
-					if ( empty( $attr['sizes'] ) ) {
+					if (empty($attr['sizes'])) {
 						$attr['sizes'] = $sizes;
 					}
 				}
@@ -888,11 +888,11 @@ 
 		 * @param string|array $size       Requested size. Image size or array of width and height values
 		 *                                 (in that order). Default 'thumbnail'.
 		 */
-		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
-		$attr = array_map( 'esc_attr', $attr );
+		$attr = apply_filters('wp_get_attachment_image_attributes', $attr, $attachment, $size);
+		$attr = array_map('esc_attr', $attr);
 		$html = rtrim("<img $hwstring");
-		foreach ( $attr as $name => $value ) {
-			$html .= " $name=" . '"' . $value . '"';
+		foreach ($attr as $name => $value) {
+			$html .= " $name=".'"'.$value.'"';
 		}
 		$html .= ' />';
 	}
@@ -911,9 +911,9 @@ 
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @return string|false Attachment URL or false if no image is available.
  */
-function wp_get_attachment_image_url( $attachment_id, $size = 'thumbnail', $icon = false ) {
-	$image = wp_get_attachment_image_src( $attachment_id, $size, $icon );
-	return isset( $image['0'] ) ? $image['0'] : false;
+function wp_get_attachment_image_url($attachment_id, $size = 'thumbnail', $icon = false) {
+	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
+	return isset($image['0']) ? $image['0'] : false;
 }
 
 /**
@@ -925,17 +925,17 @@ 
  * @param string $file Attachment file name.
  * @return string Attachment path relative to the upload directory.
  */
-function _wp_get_attachment_relative_path( $file ) {
-	$dirname = dirname( $file );
+function _wp_get_attachment_relative_path($file) {
+	$dirname = dirname($file);
 
-	if ( '.' === $dirname ) {
+	if ('.' === $dirname) {
 		return '';
 	}
 
-	if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
+	if (false !== strpos($dirname, 'wp-content/uploads')) {
 		// Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)
-		$dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
-		$dirname = ltrim( $dirname, '/' );
+		$dirname = substr($dirname, strpos($dirname, 'wp-content/uploads') + 18);
+		$dirname = ltrim($dirname, '/');
 	}
 
 	return $dirname;
@@ -954,16 +954,16 @@ 
  * @return array|bool Array of width and height values in pixels (in that order)
  *                    or false if the size doesn't exist.
  */
-function _wp_get_image_size_from_meta( $size_name, $image_meta ) {
-	if ( $size_name === 'full' ) {
+function _wp_get_image_size_from_meta($size_name, $image_meta) {
+	if ($size_name === 'full') {
 		return array(
-			absint( $image_meta['width'] ),
-			absint( $image_meta['height'] ),
+			absint($image_meta['width']),
+			absint($image_meta['height']),
 		);
-	} elseif ( ! empty( $image_meta['sizes'][$size_name] ) ) {
+	} elseif ( ! empty($image_meta['sizes'][$size_name])) {
 		return array(
-			absint( $image_meta['sizes'][$size_name]['width'] ),
-			absint( $image_meta['sizes'][$size_name]['height'] ),
+			absint($image_meta['sizes'][$size_name]['width']),
+			absint($image_meta['sizes'][$size_name]['height']),
 		);
 	}
 
@@ -984,22 +984,22 @@ 
  *                                    Default null.
  * @return string|bool A 'srcset' value string or false.
  */
-function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $image_meta = null ) {
-	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+function wp_get_attachment_image_srcset($attachment_id, $size = 'medium', $image_meta = null) {
+	if ( ! $image = wp_get_attachment_image_src($attachment_id, $size)) {
 		return false;
 	}
 
-	if ( ! is_array( $image_meta ) ) {
-		$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+	if ( ! is_array($image_meta)) {
+		$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 	}
 
 	$image_src = $image[0];
 	$size_array = array(
-		absint( $image[1] ),
-		absint( $image[2] )
+		absint($image[1]),
+		absint($image[2])
 	);
 
-	return wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+	return wp_calculate_image_srcset($size_array, $image_src, $image_meta, $attachment_id);
 }
 
 /**
@@ -1013,7 +1013,7 @@ 
  * @param int    $attachment_id Optional. The image attachment ID to pass to the filter. Default 0.
  * @return string|bool          The 'srcset' attribute value. False on error or when only one source exists.
  */
-function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id = 0 ) {
+function wp_calculate_image_srcset($size_array, $image_src, $image_meta, $attachment_id = 0) {
 	/**
 	 * Let plugins pre-filter the image meta to be able to fix inconsistencies in the stored data.
 	 *
@@ -1022,9 +1022,9 @@ 
 	 * @param string $image_src     The 'src' of the image.
 	 * @param int    $attachment_id The image attachment ID or 0 if not supplied.
 	 */
-	$image_meta = apply_filters( 'wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id );
+	$image_meta = apply_filters('wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id);
 
-	if ( empty( $image_meta['sizes'] ) || ! isset( $image_meta['file'] ) || strlen( $image_meta['file'] ) < 4 ) {
+	if (empty($image_meta['sizes']) || ! isset($image_meta['file']) || strlen($image_meta['file']) < 4) {
 		return false;
 	}
 
@@ -1035,43 +1035,43 @@ 
 	$image_height = (int) $size_array[1];
 
 	// Bail early if error/no width.
-	if ( $image_width < 1 ) {
+	if ($image_width < 1) {
 		return false;
 	}
 
-	$image_basename = wp_basename( $image_meta['file'] );
+	$image_basename = wp_basename($image_meta['file']);
 
 	/*
 	 * WordPress flattens animated GIFs into one frame when generating intermediate sizes.
 	 * To avoid hiding animation in user content, if src is a full size GIF, a srcset attribute is not generated.
 	 * If src is an intermediate size GIF, the full size is excluded from srcset to keep a flattened GIF from becoming animated.
 	 */
-	if ( ! isset( $image_sizes['thumbnail']['mime-type'] ) || 'image/gif' !== $image_sizes['thumbnail']['mime-type'] ) {
+	if ( ! isset($image_sizes['thumbnail']['mime-type']) || 'image/gif' !== $image_sizes['thumbnail']['mime-type']) {
 		$image_sizes[] = array(
 			'width'  => $image_meta['width'],
 			'height' => $image_meta['height'],
 			'file'   => $image_basename,
 		);
-	} elseif ( strpos( $image_src, $image_meta['file'] ) ) {
+	} elseif (strpos($image_src, $image_meta['file'])) {
 		return false;
 	}
 
 	// Retrieve the uploads sub-directory from the full size image.
-	$dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
+	$dirname = _wp_get_attachment_relative_path($image_meta['file']);
 
-	if ( $dirname ) {
-		$dirname = trailingslashit( $dirname );
+	if ($dirname) {
+		$dirname = trailingslashit($dirname);
 	}
 
 	$upload_dir = wp_get_upload_dir();
-	$image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
+	$image_baseurl = trailingslashit($upload_dir['baseurl']).$dirname;
 
 	/*
 	 * If currently on HTTPS, prefer HTTPS URLs when we know they're supported by the domain
 	 * (which is to say, when they share the domain name of the current request).
 	 */
-	if ( is_ssl() && 'https' !== substr( $image_baseurl, 0, 5 ) && parse_url( $image_baseurl, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
-		$image_baseurl = set_url_scheme( $image_baseurl, 'https' );
+	if (is_ssl() && 'https' !== substr($image_baseurl, 0, 5) && parse_url($image_baseurl, PHP_URL_HOST) === $_SERVER['HTTP_HOST']) {
+		$image_baseurl = set_url_scheme($image_baseurl, 'https');
 	}
 
 	/*
@@ -1079,7 +1079,7 @@ 
 	 * contain a unique hash. Look for that hash and use it later to filter
 	 * out images that are leftovers from previous versions.
 	 */
-	$image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash );
+	$image_edited = preg_match('/-e[0-9]{13}/', wp_basename($image_src), $image_edit_hash);
 
 	/**
 	 * Filters the maximum image width to be included in a 'srcset' attribute.
@@ -1089,7 +1089,7 @@ 
 	 * @param int   $max_width  The maximum image width to be included in the 'srcset'. Default '1600'.
 	 * @param array $size_array Array of width and height values in pixels (in that order).
 	 */
-	$max_srcset_image_width = apply_filters( 'max_srcset_image_width', 1600, $size_array );
+	$max_srcset_image_width = apply_filters('max_srcset_image_width', 1600, $size_array);
 
 	// Array to hold URL candidates.
 	$sources = array();
@@ -1105,21 +1105,21 @@ 
 	 * Loop through available images. Only use images that are resized
 	 * versions of the same edit.
 	 */
-	foreach ( $image_sizes as $image ) {
+	foreach ($image_sizes as $image) {
 		$is_src = false;
 
 		// Check if image meta isn't corrupted.
-		if ( ! is_array( $image ) ) {
+		if ( ! is_array($image)) {
 			continue;
 		}
 
 		// If the file name is part of the `src`, we've confirmed a match.
-		if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) {
+		if ( ! $src_matched && false !== strpos($image_src, $dirname.$image['file'])) {
 			$src_matched = $is_src = true;
 		}
 
 		// Filter out images that are from previous edits.
-		if ( $image_edited && ! strpos( $image['file'], $image_edit_hash[0] ) ) {
+		if ($image_edited && ! strpos($image['file'], $image_edit_hash[0])) {
 			continue;
 		}
 
@@ -1127,24 +1127,24 @@ 
 		 * Filters out images that are wider than '$max_srcset_image_width' unless
 		 * that file is in the 'src' attribute.
 		 */
-		if ( $max_srcset_image_width && $image['width'] > $max_srcset_image_width && ! $is_src ) {
+		if ($max_srcset_image_width && $image['width'] > $max_srcset_image_width && ! $is_src) {
 			continue;
 		}
 
 		// If the image dimensions are within 1px of the expected size, use it.
-		if ( wp_image_matches_ratio( $image_width, $image_height, $image['width'], $image['height'] ) ) {
+		if (wp_image_matches_ratio($image_width, $image_height, $image['width'], $image['height'])) {
 			// Add the URL, descriptor, and value to the sources array to be returned.
 			$source = array(
-				'url'        => $image_baseurl . $image['file'],
+				'url'        => $image_baseurl.$image['file'],
 				'descriptor' => 'w',
 				'value'      => $image['width'],
 			);
 
 			// The 'src' image has to be the first in the 'srcset', because of a bug in iOS8. See #35030.
-			if ( $is_src ) {
-				$sources = array( $image['width'] => $source ) + $sources;
+			if ($is_src) {
+				$sources = array($image['width'] => $source) + $sources;
 			} else {
-				$sources[ $image['width'] ] = $source;
+				$sources[$image['width']] = $source;
 			}
 		}
 	}
@@ -1170,20 +1170,20 @@ 
 	 * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
 	 * @param int    $attachment_id Image attachment ID or 0.
 	 */
-	$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
+	$sources = apply_filters('wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id);
 
 	// Only return a 'srcset' value if there is more than one source.
-	if ( ! $src_matched || count( $sources ) < 2 ) {
+	if ( ! $src_matched || count($sources) < 2) {
 		return false;
 	}
 
 	$srcset = '';
 
-	foreach ( $sources as $source ) {
-		$srcset .= str_replace( ' ', '%20', $source['url'] ) . ' ' . $source['value'] . $source['descriptor'] . ', ';
+	foreach ($sources as $source) {
+		$srcset .= str_replace(' ', '%20', $source['url']).' '.$source['value'].$source['descriptor'].', ';
 	}
 
-	return rtrim( $srcset, ', ' );
+	return rtrim($srcset, ', ');
 }
 
 /**
@@ -1200,22 +1200,22 @@ 
  *                                    Default null.
  * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
  */
-function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $image_meta = null ) {
-	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+function wp_get_attachment_image_sizes($attachment_id, $size = 'medium', $image_meta = null) {
+	if ( ! $image = wp_get_attachment_image_src($attachment_id, $size)) {
 		return false;
 	}
 
-	if ( ! is_array( $image_meta ) ) {
-		$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+	if ( ! is_array($image_meta)) {
+		$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 	}
 
 	$image_src = $image[0];
 	$size_array = array(
-		absint( $image[1] ),
-		absint( $image[2] )
+		absint($image[1]),
+		absint($image[2])
 	);
 
-	return wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+	return wp_calculate_image_sizes($size_array, $image_src, $image_meta, $attachment_id);
 }
 
 /**
@@ -1232,30 +1232,30 @@ 
  *                                    is needed when using the image size name as argument for `$size`. Default 0.
  * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
  */
-function wp_calculate_image_sizes( $size, $image_src = null, $image_meta = null, $attachment_id = 0 ) {
+function wp_calculate_image_sizes($size, $image_src = null, $image_meta = null, $attachment_id = 0) {
 	$width = 0;
 
-	if ( is_array( $size ) ) {
-		$width = absint( $size[0] );
-	} elseif ( is_string( $size ) ) {
-		if ( ! $image_meta && $attachment_id ) {
-			$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+	if (is_array($size)) {
+		$width = absint($size[0]);
+	} elseif (is_string($size)) {
+		if ( ! $image_meta && $attachment_id) {
+			$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 		}
 
-		if ( is_array( $image_meta ) ) {
-			$size_array = _wp_get_image_size_from_meta( $size, $image_meta );
-			if ( $size_array ) {
-				$width = absint( $size_array[0] );
+		if (is_array($image_meta)) {
+			$size_array = _wp_get_image_size_from_meta($size, $image_meta);
+			if ($size_array) {
+				$width = absint($size_array[0]);
 			}
 		}
 	}
 
-	if ( ! $width ) {
+	if ( ! $width) {
 		return false;
 	}
 
 	// Setup the default 'sizes' attribute.
-	$sizes = sprintf( '(max-width: %1$dpx) 100vw, %1$dpx', $width );
+	$sizes = sprintf('(max-width: %1$dpx) 100vw, %1$dpx', $width);
 
 	/**
 	 * Filters the output of 'wp_calculate_image_sizes()'.
@@ -1269,7 +1269,7 @@ 
 	 * @param array|null   $image_meta    The image meta data as returned by wp_get_attachment_metadata() or null.
 	 * @param int          $attachment_id Image attachment ID of the original image or 0.
 	 */
-	return apply_filters( 'wp_calculate_image_sizes', $sizes, $size, $image_src, $image_meta, $attachment_id );
+	return apply_filters('wp_calculate_image_sizes', $sizes, $size, $image_src, $image_meta, $attachment_id);
 }
 
 /**
@@ -1282,40 +1282,40 @@ 
  * @param string $content The raw post content to be filtered.
  * @return string Converted content with 'srcset' and 'sizes' attributes added to images.
  */
-function wp_make_content_images_responsive( $content ) {
-	if ( ! preg_match_all( '/<img [^>]+>/', $content, $matches ) ) {
+function wp_make_content_images_responsive($content) {
+	if ( ! preg_match_all('/<img [^>]+>/', $content, $matches)) {
 		return $content;
 	}
 
 	$selected_images = $attachment_ids = array();
 
-	foreach( $matches[0] as $image ) {
-		if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
-			( $attachment_id = absint( $class_id[1] ) ) ) {
+	foreach ($matches[0] as $image) {
+		if (false === strpos($image, ' srcset=') && preg_match('/wp-image-([0-9]+)/i', $image, $class_id) &&
+			($attachment_id = absint($class_id[1]))) {
 
 			/*
 			 * If exactly the same image tag is used more than once, overwrite it.
 			 * All identical tags will be replaced later with 'str_replace()'.
 			 */
-			$selected_images[ $image ] = $attachment_id;
+			$selected_images[$image] = $attachment_id;
 			// Overwrite the ID when the same image is included more than once.
-			$attachment_ids[ $attachment_id ] = true;
+			$attachment_ids[$attachment_id] = true;
 		}
 	}
 
-	if ( count( $attachment_ids ) > 1 ) {
+	if (count($attachment_ids) > 1) {
 		/*
 		 * Warm object cache for use with 'get_post_meta()'.
 		 *
 		 * To avoid making a database call for each image, a single query
 		 * warms the object cache with the meta information for all images.
 		 */
-		update_meta_cache( 'post', array_keys( $attachment_ids ) );
+		update_meta_cache('post', array_keys($attachment_ids));
 	}
 
-	foreach ( $selected_images as $image => $attachment_id ) {
-		$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
-		$content = str_replace( $image, wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ), $content );
+	foreach ($selected_images as $image => $attachment_id) {
+		$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
+		$content = str_replace($image, wp_image_add_srcset_and_sizes($image, $image_meta, $attachment_id), $content);
 	}
 
 	return $content;
@@ -1334,43 +1334,43 @@ 
  * @param int    $attachment_id Image attachment ID.
  * @return string Converted 'img' element with 'srcset' and 'sizes' attributes added.
  */
-function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
+function wp_image_add_srcset_and_sizes($image, $image_meta, $attachment_id) {
 	// Ensure the image meta exists.
-	if ( empty( $image_meta['sizes'] ) ) {
+	if (empty($image_meta['sizes'])) {
 		return $image;
 	}
 
-	$image_src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : '';
-	list( $image_src ) = explode( '?', $image_src );
+	$image_src = preg_match('/src="([^"]+)"/', $image, $match_src) ? $match_src[1] : '';
+	list($image_src) = explode('?', $image_src);
 
 	// Return early if we couldn't get the image source.
-	if ( ! $image_src ) {
+	if ( ! $image_src) {
 		return $image;
 	}
 
 	// Bail early if an image has been inserted and later edited.
-	if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) &&
-		strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
+	if (preg_match('/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash) &&
+		strpos(wp_basename($image_src), $img_edit_hash[0]) === false) {
 
 		return $image;
 	}
 
-	$width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
-	$height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
+	$width  = preg_match('/ width="([0-9]+)"/', $image, $match_width) ? (int) $match_width[1] : 0;
+	$height = preg_match('/ height="([0-9]+)"/', $image, $match_height) ? (int) $match_height[1] : 0;
 
-	if ( ! $width || ! $height ) {
+	if ( ! $width || ! $height) {
 		/*
 		 * If attempts to parse the size value failed, attempt to use the image meta data to match
 		 * the image file name from 'src' against the available sizes for an attachment.
 		 */
-		$image_filename = wp_basename( $image_src );
+		$image_filename = wp_basename($image_src);
 
-		if ( $image_filename === wp_basename( $image_meta['file'] ) ) {
+		if ($image_filename === wp_basename($image_meta['file'])) {
 			$width = (int) $image_meta['width'];
 			$height = (int) $image_meta['height'];
 		} else {
-			foreach( $image_meta['sizes'] as $image_size_data ) {
-				if ( $image_filename === $image_size_data['file'] ) {
+			foreach ($image_meta['sizes'] as $image_size_data) {
+				if ($image_filename === $image_size_data['file']) {
 					$width = (int) $image_size_data['width'];
 					$height = (int) $image_size_data['height'];
 					break;
@@ -1379,32 +1379,32 @@ 
 		}
 	}
 
-	if ( ! $width || ! $height ) {
+	if ( ! $width || ! $height) {
 		return $image;
 	}
 
-	$size_array = array( $width, $height );
-	$srcset = wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+	$size_array = array($width, $height);
+	$srcset = wp_calculate_image_srcset($size_array, $image_src, $image_meta, $attachment_id);
 
-	if ( $srcset ) {
+	if ($srcset) {
 		// Check if there is already a 'sizes' attribute.
-		$sizes = strpos( $image, ' sizes=' );
+		$sizes = strpos($image, ' sizes=');
 
-		if ( ! $sizes ) {
-			$sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+		if ( ! $sizes) {
+			$sizes = wp_calculate_image_sizes($size_array, $image_src, $image_meta, $attachment_id);
 		}
 	}
 
-	if ( $srcset && $sizes ) {
+	if ($srcset && $sizes) {
 		// Format the 'srcset' and 'sizes' string and escape attributes.
-		$attr = sprintf( ' srcset="%s"', esc_attr( $srcset ) );
+		$attr = sprintf(' srcset="%s"', esc_attr($srcset));
 
-		if ( is_string( $sizes ) ) {
-			$attr .= sprintf( ' sizes="%s"', esc_attr( $sizes ) );
+		if (is_string($sizes)) {
+			$attr .= sprintf(' sizes="%s"', esc_attr($sizes));
 		}
 
 		// Add 'srcset' and 'sizes' attributes to the image markup.
-		$image = preg_replace( '/<img ([^>]+?)[\/ ]*>/', '<img $1' . $attr . ' />', $image );
+		$image = preg_replace('/<img ([^>]+?)[\/ ]*>/', '<img $1'.$attr.' />', $image);
 	}
 
 	return $image;
@@ -1422,7 +1422,7 @@ 
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  * @return array Modified array of attributes including the new 'wp-post-image' class.
  */
-function _wp_post_thumbnail_class_filter( $attr ) {
+function _wp_post_thumbnail_class_filter($attr) {
 	$attr['class'] .= ' wp-post-image';
 	return $attr;
 }
@@ -1436,8 +1436,8 @@ 
  *
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  */
-function _wp_post_thumbnail_class_filter_add( $attr ) {
-	add_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+function _wp_post_thumbnail_class_filter_add($attr) {
+	add_filter('wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter');
 }
 
 /**
@@ -1449,8 +1449,8 @@ 
  *
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  */
-function _wp_post_thumbnail_class_filter_remove( $attr ) {
-	remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+function _wp_post_thumbnail_class_filter_remove($attr) {
+	remove_filter('wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter');
 }
 
 add_shortcode('wp_caption', 'img_caption_shortcode');
@@ -1481,15 +1481,15 @@ 
  * @param string $content Shortcode content.
  * @return string HTML content to display the caption.
  */
-function img_caption_shortcode( $attr, $content = null ) {
+function img_caption_shortcode($attr, $content = null) {
 	// New-style shortcode with the caption inside the shortcode with the link and image tags.
-	if ( ! isset( $attr['caption'] ) ) {
-		if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
+	if ( ! isset($attr['caption'])) {
+		if (preg_match('#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches)) {
 			$content = $matches[1];
-			$attr['caption'] = trim( $matches[2] );
+			$attr['caption'] = trim($matches[2]);
 		}
-	} elseif ( strpos( $attr['caption'], '<' ) !== false ) {
-		$attr['caption'] = wp_kses( $attr['caption'], 'post' );
+	} elseif (strpos($attr['caption'], '<') !== false) {
+		$attr['caption'] = wp_kses($attr['caption'], 'post');
 	}
 
 	/**
@@ -1506,30 +1506,30 @@ 
 	 * @param array  $attr    Attributes of the caption shortcode.
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
-	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
+	$output = apply_filters('img_caption_shortcode', '', $attr, $content);
+	if ($output != '')
 		return $output;
 
-	$atts = shortcode_atts( array(
+	$atts = shortcode_atts(array(
 		'id'	  => '',
 		'align'	  => 'alignnone',
 		'width'	  => '',
 		'caption' => '',
 		'class'   => '',
-	), $attr, 'caption' );
+	), $attr, 'caption');
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
+	if ($atts['width'] < 1 || empty($atts['caption']))
 		return $content;
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty($atts['id']))
+		$atts['id'] = 'id="'.esc_attr(sanitize_html_class($atts['id'])).'" ';
 
-	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
+	$class = trim('wp-caption '.$atts['align'].' '.$atts['class']);
 
-	$html5 = current_theme_supports( 'html5', 'caption' );
+	$html5 = current_theme_supports('html5', 'caption');
 	// HTML5 captions never added the extra 10px to the image width
-	$width = $html5 ? $atts['width'] : ( 10 + $atts['width'] );
+	$width = $html5 ? $atts['width'] : (10 + $atts['width']);
 
 	/**
 	 * Filters the width of an image's caption.
@@ -1546,19 +1546,19 @@ 
 	 * @param array  $atts     Attributes of the caption shortcode.
 	 * @param string $content  The image element, possibly wrapped in a hyperlink.
 	 */
-	$caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content );
+	$caption_width = apply_filters('img_caption_shortcode_width', $width, $atts, $content);
 
 	$style = '';
-	if ( $caption_width )
-		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	if ($caption_width)
+		$style = 'style="width: '.(int) $caption_width.'px" ';
 
 	$html = '';
-	if ( $html5 ) {
-		$html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-		. do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+	if ($html5) {
+		$html = '<figure '.$atts['id'].$style.'class="'.esc_attr($class).'">'
+		. do_shortcode($content).'<figcaption class="wp-caption-text">'.$atts['caption'].'</figcaption></figure>';
 	} else {
-		$html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-		. do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+		$html = '<div '.$atts['id'].$style.'class="'.esc_attr($class).'">'
+		. do_shortcode($content).'<p class="wp-caption-text">'.$atts['caption'].'</p></div>';
 	}
 
 	return $html;
@@ -1600,15 +1600,15 @@ 
  * }
  * @return string HTML content to display gallery.
  */
-function gallery_shortcode( $attr ) {
+function gallery_shortcode($attr) {
 	$post = get_post();
 
 	static $instance = 0;
 	$instance++;
 
-	if ( ! empty( $attr['ids'] ) ) {
+	if ( ! empty($attr['ids'])) {
 		// 'ids' is explicitly ordered, unless you specify otherwise.
-		if ( empty( $attr['orderby'] ) ) {
+		if (empty($attr['orderby'])) {
 			$attr['orderby'] = 'post__in';
 		}
 		$attr['include'] = $attr['ids'];
@@ -1629,69 +1629,69 @@ 
 	 * @param array  $attr     Attributes of the gallery shortcode.
 	 * @param int    $instance Unique numeric ID of this gallery shortcode instance.
 	 */
-	$output = apply_filters( 'post_gallery', '', $attr, $instance );
-	if ( $output != '' ) {
+	$output = apply_filters('post_gallery', '', $attr, $instance);
+	if ($output != '') {
 		return $output;
 	}
 
-	$html5 = current_theme_supports( 'html5', 'gallery' );
-	$atts = shortcode_atts( array(
+	$html5 = current_theme_supports('html5', 'gallery');
+	$atts = shortcode_atts(array(
 		'order'      => 'ASC',
 		'orderby'    => 'menu_order ID',
 		'id'         => $post ? $post->ID : 0,
-		'itemtag'    => $html5 ? 'figure'     : 'dl',
-		'icontag'    => $html5 ? 'div'        : 'dt',
+		'itemtag'    => $html5 ? 'figure' : 'dl',
+		'icontag'    => $html5 ? 'div' : 'dt',
 		'captiontag' => $html5 ? 'figcaption' : 'dd',
 		'columns'    => 3,
 		'size'       => 'thumbnail',
 		'include'    => '',
 		'exclude'    => '',
 		'link'       => ''
-	), $attr, 'gallery' );
+	), $attr, 'gallery');
 
-	$id = intval( $atts['id'] );
+	$id = intval($atts['id']);
 
-	if ( ! empty( $atts['include'] ) ) {
-		$_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+	if ( ! empty($atts['include'])) {
+		$_attachments = get_posts(array('include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 
 		$attachments = array();
-		foreach ( $_attachments as $key => $val ) {
+		foreach ($_attachments as $key => $val) {
 			$attachments[$val->ID] = $_attachments[$key];
 		}
-	} elseif ( ! empty( $atts['exclude'] ) ) {
-		$attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+	} elseif ( ! empty($atts['exclude'])) {
+		$attachments = get_children(array('post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 	} else {
-		$attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+		$attachments = get_children(array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 	}
 
-	if ( empty( $attachments ) ) {
+	if (empty($attachments)) {
 		return '';
 	}
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		$output = "\n";
-		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n";
+		foreach ($attachments as $att_id => $attachment) {
+			$output .= wp_get_attachment_link($att_id, $atts['size'], true)."\n";
 		}
 		return $output;
 	}
 
-	$itemtag = tag_escape( $atts['itemtag'] );
-	$captiontag = tag_escape( $atts['captiontag'] );
-	$icontag = tag_escape( $atts['icontag'] );
-	$valid_tags = wp_kses_allowed_html( 'post' );
-	if ( ! isset( $valid_tags[ $itemtag ] ) ) {
+	$itemtag = tag_escape($atts['itemtag']);
+	$captiontag = tag_escape($atts['captiontag']);
+	$icontag = tag_escape($atts['icontag']);
+	$valid_tags = wp_kses_allowed_html('post');
+	if ( ! isset($valid_tags[$itemtag])) {
 		$itemtag = 'dl';
 	}
-	if ( ! isset( $valid_tags[ $captiontag ] ) ) {
+	if ( ! isset($valid_tags[$captiontag])) {
 		$captiontag = 'dd';
 	}
-	if ( ! isset( $valid_tags[ $icontag ] ) ) {
+	if ( ! isset($valid_tags[$icontag])) {
 		$icontag = 'dt';
 	}
 
-	$columns = intval( $atts['columns'] );
-	$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+	$columns = intval($atts['columns']);
+	$itemwidth = $columns > 0 ? floor(100 / $columns) : 100;
 	$float = is_rtl() ? 'right' : 'left';
 
 	$selector = "gallery-{$instance}";
@@ -1707,7 +1707,7 @@ 
 	 *                    Defaults to false if the theme supports HTML5 galleries.
 	 *                    Otherwise, defaults to true.
 	 */
-	if ( apply_filters( 'use_default_gallery_style', ! $html5 ) ) {
+	if (apply_filters('use_default_gallery_style', ! $html5)) {
 		$gallery_style = "
 		<style type='text/css'>
 			#{$selector} {
@@ -1729,7 +1729,7 @@ 
 		</style>\n\t\t";
 	}
 
-	$size_class = sanitize_html_class( $atts['size'] );
+	$size_class = sanitize_html_class($atts['size']);
 	$gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
 
 	/**
@@ -1740,43 +1740,43 @@ 
 	 * @param string $gallery_style Default CSS styles and opening HTML div container
 	 *                              for the gallery shortcode output.
 	 */
-	$output = apply_filters( 'gallery_style', $gallery_style . $gallery_div );
+	$output = apply_filters('gallery_style', $gallery_style.$gallery_div);
 
 	$i = 0;
-	foreach ( $attachments as $id => $attachment ) {
+	foreach ($attachments as $id => $attachment) {
 
-		$attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : '';
-		if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) {
-			$image_output = wp_get_attachment_link( $id, $atts['size'], false, false, false, $attr );
-		} elseif ( ! empty( $atts['link'] ) && 'none' === $atts['link'] ) {
-			$image_output = wp_get_attachment_image( $id, $atts['size'], false, $attr );
+		$attr = (trim($attachment->post_excerpt)) ? array('aria-describedby' => "$selector-$id") : '';
+		if ( ! empty($atts['link']) && 'file' === $atts['link']) {
+			$image_output = wp_get_attachment_link($id, $atts['size'], false, false, false, $attr);
+		} elseif ( ! empty($atts['link']) && 'none' === $atts['link']) {
+			$image_output = wp_get_attachment_image($id, $atts['size'], false, $attr);
 		} else {
-			$image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr );
+			$image_output = wp_get_attachment_link($id, $atts['size'], true, false, false, $attr);
 		}
-		$image_meta  = wp_get_attachment_metadata( $id );
+		$image_meta  = wp_get_attachment_metadata($id);
 
 		$orientation = '';
-		if ( isset( $image_meta['height'], $image_meta['width'] ) ) {
-			$orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
+		if (isset($image_meta['height'], $image_meta['width'])) {
+			$orientation = ($image_meta['height'] > $image_meta['width']) ? 'portrait' : 'landscape';
 		}
 		$output .= "<{$itemtag} class='gallery-item'>";
 		$output .= "
 			<{$icontag} class='gallery-icon {$orientation}'>
 				$image_output
 			</{$icontag}>";
-		if ( $captiontag && trim($attachment->post_excerpt) ) {
+		if ($captiontag && trim($attachment->post_excerpt)) {
 			$output .= "
 				<{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'>
-				" . wptexturize($attachment->post_excerpt) . "
+				".wptexturize($attachment->post_excerpt)."
 				</{$captiontag}>";
 		}
 		$output .= "</{$itemtag}>";
-		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0 ) {
+		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0) {
 			$output .= '<br style="clear: both" />';
 		}
 	}
 
-	if ( ! $html5 && $columns > 0 && $i % $columns !== 0 ) {
+	if ( ! $html5 && $columns > 0 && $i % $columns !== 0) {
 		$output .= "
 			<br style='clear: both' />";
 	}
@@ -1801,7 +1801,7 @@ 
 	<div class="wp-playlist-caption">
 		<span class="wp-playlist-item-meta wp-playlist-item-title"><?php
 			/* translators: playlist item title */
-			printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
+			printf(_x('&#8220;%s&#8221;', 'playlist item title'), '{{ data.title }}');
 		?></span>
 		<# if ( data.meta.album ) { #><span class="wp-playlist-item-meta wp-playlist-item-album">{{ data.meta.album }}</span><# } #>
 		<# if ( data.meta.artist ) { #><span class="wp-playlist-item-meta wp-playlist-item-artist">{{ data.meta.artist }}</span><# } #>
@@ -1816,7 +1816,7 @@ 
 			<# } else { #>
 				<span class="wp-playlist-item-title"><?php
 					/* translators: playlist item title */
-					printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{{ data.title }}}' );
+					printf(_x('&#8220;%s&#8221;', 'playlist item title'), '{{{ data.title }}}');
 				?></span>
 				<# if ( data.artists && data.meta.artist ) { #>
 				<span class="wp-playlist-item-artist"> &mdash; {{ data.meta.artist }}</span>
@@ -1838,14 +1838,14 @@ 
  *
  * @param string $type Type of playlist. Accepts 'audio' or 'video'.
  */
-function wp_playlist_scripts( $type ) {
-	wp_enqueue_style( 'wp-mediaelement' );
-	wp_enqueue_script( 'wp-playlist' );
+function wp_playlist_scripts($type) {
+	wp_enqueue_style('wp-mediaelement');
+	wp_enqueue_script('wp-playlist');
 ?>
-<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ) ?>');</script><![endif]-->
+<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js($type) ?>');</script><![endif]-->
 <?php
-	add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 );
-	add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
+	add_action('wp_footer', 'wp_underscore_playlist_templates', 0);
+	add_action('admin_footer', 'wp_underscore_playlist_templates', 0);
 }
 
 /**
@@ -1885,16 +1885,16 @@ 
  *
  * @return string Playlist output. Empty string if the passed type is unsupported.
  */
-function wp_playlist_shortcode( $attr ) {
+function wp_playlist_shortcode($attr) {
 	global $content_width;
 	$post = get_post();
 
 	static $instance = 0;
 	$instance++;
 
-	if ( ! empty( $attr['ids'] ) ) {
+	if ( ! empty($attr['ids'])) {
 		// 'ids' is explicitly ordered, unless you specify otherwise.
-		if ( empty( $attr['orderby'] ) ) {
+		if (empty($attr['orderby'])) {
 			$attr['orderby'] = 'post__in';
 		}
 		$attr['include'] = $attr['ids'];
@@ -1913,12 +1913,12 @@ 
 	 * @param array  $attr     An array of shortcode attributes.
 	 * @param int    $instance Unique numeric ID of this playlist shortcode instance.
 	 */
-	$output = apply_filters( 'post_playlist', '', $attr, $instance );
-	if ( $output != '' ) {
+	$output = apply_filters('post_playlist', '', $attr, $instance);
+	if ($output != '') {
 		return $output;
 	}
 
-	$atts = shortcode_atts( array(
+	$atts = shortcode_atts(array(
 		'type'		=> 'audio',
 		'order'		=> 'ASC',
 		'orderby'	=> 'menu_order ID',
@@ -1930,11 +1930,11 @@ 
 		'tracknumbers' => true,
 		'images'	=> true,
 		'artists'	=> true
-	), $attr, 'playlist' );
+	), $attr, 'playlist');
 
-	$id = intval( $atts['id'] );
+	$id = intval($atts['id']);
 
-	if ( $atts['type'] !== 'audio' ) {
+	if ($atts['type'] !== 'audio') {
 		$atts['type'] = 'video';
 	}
 
@@ -1946,31 +1946,31 @@ 
 		'orderby' => $atts['orderby']
 	);
 
-	if ( ! empty( $atts['include'] ) ) {
+	if ( ! empty($atts['include'])) {
 		$args['include'] = $atts['include'];
-		$_attachments = get_posts( $args );
+		$_attachments = get_posts($args);
 
 		$attachments = array();
-		foreach ( $_attachments as $key => $val ) {
+		foreach ($_attachments as $key => $val) {
 			$attachments[$val->ID] = $_attachments[$key];
 		}
-	} elseif ( ! empty( $atts['exclude'] ) ) {
+	} elseif ( ! empty($atts['exclude'])) {
 		$args['post_parent'] = $id;
 		$args['exclude'] = $atts['exclude'];
-		$attachments = get_children( $args );
+		$attachments = get_children($args);
 	} else {
 		$args['post_parent'] = $id;
-		$attachments = get_children( $args );
+		$attachments = get_children($args);
 	}
 
-	if ( empty( $attachments ) ) {
+	if (empty($attachments)) {
 		return '';
 	}
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		$output = "\n";
-		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id ) . "\n";
+		foreach ($attachments as $att_id => $attachment) {
+			$output .= wp_get_attachment_link($att_id)."\n";
 		}
 		return $output;
 	}
@@ -1980,22 +1980,22 @@ 
 	$default_width = 640;
 	$default_height = 360;
 
-	$theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer );
-	$theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
+	$theme_width = empty($content_width) ? $default_width : ($content_width - $outer);
+	$theme_height = empty($content_width) ? $default_height : round(($default_height * $theme_width) / $default_width);
 
 	$data = array(
 		'type' => $atts['type'],
 		// don't pass strings to JSON, will be truthy in JS
-		'tracklist' => wp_validate_boolean( $atts['tracklist'] ),
-		'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),
-		'images' => wp_validate_boolean( $atts['images'] ),
-		'artists' => wp_validate_boolean( $atts['artists'] ),
+		'tracklist' => wp_validate_boolean($atts['tracklist']),
+		'tracknumbers' => wp_validate_boolean($atts['tracknumbers']),
+		'images' => wp_validate_boolean($atts['images']),
+		'artists' => wp_validate_boolean($atts['artists']),
 	);
 
 	$tracks = array();
-	foreach ( $attachments as $attachment ) {
-		$url = wp_get_attachment_url( $attachment->ID );
-		$ftype = wp_check_filetype( $url, wp_get_mime_types() );
+	foreach ($attachments as $attachment) {
+		$url = wp_get_attachment_url($attachment->ID);
+		$ftype = wp_check_filetype($url, wp_get_mime_types());
 		$track = array(
 			'src' => $url,
 			'type' => $ftype['type'],
@@ -2005,27 +2005,27 @@ 
 		);
 
 		$track['meta'] = array();
-		$meta = wp_get_attachment_metadata( $attachment->ID );
-		if ( ! empty( $meta ) ) {
+		$meta = wp_get_attachment_metadata($attachment->ID);
+		if ( ! empty($meta)) {
 
-			foreach ( wp_get_attachment_id3_keys( $attachment ) as $key => $label ) {
-				if ( ! empty( $meta[ $key ] ) ) {
-					$track['meta'][ $key ] = $meta[ $key ];
+			foreach (wp_get_attachment_id3_keys($attachment) as $key => $label) {
+				if ( ! empty($meta[$key])) {
+					$track['meta'][$key] = $meta[$key];
 				}
 			}
 
-			if ( 'video' === $atts['type'] ) {
-				if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+			if ('video' === $atts['type']) {
+				if ( ! empty($meta['width']) && ! empty($meta['height'])) {
 					$width = $meta['width'];
 					$height = $meta['height'];
-					$theme_height = round( ( $height * $theme_width ) / $width );
+					$theme_height = round(($height * $theme_width) / $width);
 				} else {
 					$width = $default_width;
 					$height = $default_height;
 				}
 
 				$track['dimensions'] = array(
-					'original' => compact( 'width', 'height' ),
+					'original' => compact('width', 'height'),
 					'resized' => array(
 						'width' => $theme_width,
 						'height' => $theme_height
@@ -2034,19 +2034,19 @@ 
 			}
 		}
 
-		if ( $atts['images'] ) {
-			$thumb_id = get_post_thumbnail_id( $attachment->ID );
-			if ( ! empty( $thumb_id ) ) {
-				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'full' );
-				$track['image'] = compact( 'src', 'width', 'height' );
-				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'thumbnail' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+		if ($atts['images']) {
+			$thumb_id = get_post_thumbnail_id($attachment->ID);
+			if ( ! empty($thumb_id)) {
+				list($src, $width, $height) = wp_get_attachment_image_src($thumb_id, 'full');
+				$track['image'] = compact('src', 'width', 'height');
+				list($src, $width, $height) = wp_get_attachment_image_src($thumb_id, 'thumbnail');
+				$track['thumb'] = compact('src', 'width', 'height');
 			} else {
-				$src = wp_mime_type_icon( $attachment->ID );
+				$src = wp_mime_type_icon($attachment->ID);
 				$width = 48;
 				$height = 64;
-				$track['image'] = compact( 'src', 'width', 'height' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+				$track['image'] = compact('src', 'width', 'height');
+				$track['thumb'] = compact('src', 'width', 'height');
 			}
 		}
 
@@ -2054,12 +2054,12 @@ 
 	}
 	$data['tracks'] = $tracks;
 
-	$safe_type = esc_attr( $atts['type'] );
-	$safe_style = esc_attr( $atts['style'] );
+	$safe_type = esc_attr($atts['type']);
+	$safe_style = esc_attr($atts['style']);
 
 	ob_start();
 
-	if ( 1 === $instance ) {
+	if (1 === $instance) {
 		/**
 		 * Prints and enqueues playlist scripts, styles, and JavaScript templates.
 		 *
@@ -2068,32 +2068,32 @@ 
 		 * @param string $type  Type of playlist. Possible values are 'audio' or 'video'.
 		 * @param string $style The 'theme' for the playlist. Core provides 'light' and 'dark'.
 		 */
-		do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] );
+		do_action('wp_playlist_scripts', $atts['type'], $atts['style']);
 	} ?>
 <div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>">
-	<?php if ( 'audio' === $atts['type'] ): ?>
+	<?php if ('audio' === $atts['type']): ?>
 	<div class="wp-playlist-current-item"></div>
 	<?php endif ?>
 	<<?php echo $safe_type ?> controls="controls" preload="none" width="<?php
 		echo (int) $theme_width;
-	?>"<?php if ( 'video' === $safe_type ):
+	?>"<?php if ('video' === $safe_type):
 		echo ' height="', (int) $theme_height, '"';
 	endif; ?>></<?php echo $safe_type ?>>
 	<div class="wp-playlist-next"></div>
 	<div class="wp-playlist-prev"></div>
 	<noscript>
 	<ol><?php
-	foreach ( $attachments as $att_id => $attachment ) {
-		printf( '<li>%s</li>', wp_get_attachment_link( $att_id ) );
+	foreach ($attachments as $att_id => $attachment) {
+		printf('<li>%s</li>', wp_get_attachment_link($att_id));
 	}
 	?></ol>
 	</noscript>
-	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ) ?></script>
+	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode($data) ?></script>
 </div>
 	<?php
 	return ob_get_clean();
 }
-add_shortcode( 'playlist', 'wp_playlist_shortcode' );
+add_shortcode('playlist', 'wp_playlist_shortcode');
 
 /**
  * Provides a No-JS Flash fallback as a last resort for audio / video.
@@ -2103,7 +2103,7 @@ 
  * @param string $url The media element URL.
  * @return string Fallback HTML.
  */
-function wp_mediaelement_fallback( $url ) {
+function wp_mediaelement_fallback($url) {
 	/**
 	 * Filters the Mediaelement fallback output for no-JS.
 	 *
@@ -2112,7 +2112,7 @@ 
 	 * @param string $output Fallback output for no-JS.
 	 * @param string $url    Media file URL.
 	 */
-	return apply_filters( 'wp_mediaelement_fallback', sprintf( '<a href="%1$s">%1$s</a>', esc_url( $url ) ), $url );
+	return apply_filters('wp_mediaelement_fallback', sprintf('<a href="%1$s">%1$s</a>', esc_url($url)), $url);
 }
 
 /**
@@ -2131,7 +2131,7 @@ 
 	 * @param array $extensions An array of support audio formats. Defaults are
 	 *                          'mp3', 'ogg', 'wma', 'm4a', 'wav'.
 	 */
-	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'wma', 'm4a', 'wav' ) );
+	return apply_filters('wp_audio_extensions', array('mp3', 'ogg', 'wma', 'm4a', 'wav'));
 }
 
 /**
@@ -2143,19 +2143,19 @@ 
  * @param string  $context    Optional. The context. Accepts 'edit', 'display'. Default 'display'.
  * @return array Key/value pairs of field keys to labels.
  */
-function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) {
+function wp_get_attachment_id3_keys($attachment, $context = 'display') {
 	$fields = array(
-		'artist' => __( 'Artist' ),
-		'album' => __( 'Album' ),
+		'artist' => __('Artist'),
+		'album' => __('Album'),
 	);
 
-	if ( 'display' === $context ) {
-		$fields['genre']            = __( 'Genre' );
-		$fields['year']             = __( 'Year' );
-		$fields['length_formatted'] = _x( 'Length', 'video or audio' );
-	} elseif ( 'js' === $context ) {
-		$fields['bitrate']          = __( 'Bitrate' );
-		$fields['bitrate_mode']     = __( 'Bitrate Mode' );
+	if ('display' === $context) {
+		$fields['genre']            = __('Genre');
+		$fields['year']             = __('Year');
+		$fields['length_formatted'] = _x('Length', 'video or audio');
+	} elseif ('js' === $context) {
+		$fields['bitrate']          = __('Bitrate');
+		$fields['bitrate_mode']     = __('Bitrate Mode');
 	}
 
 	/**
@@ -2167,7 +2167,7 @@ 
 	 * @param WP_Post $attachment Attachment object.
 	 * @param string  $context    The context. Accepts 'edit', 'display'. Default 'display'.
 	 */
-	return apply_filters( 'wp_get_attachment_id3_keys', $fields, $attachment, $context );
+	return apply_filters('wp_get_attachment_id3_keys', $fields, $attachment, $context);
 }
 /**
  * Builds the Audio shortcode output.
@@ -2192,7 +2192,7 @@ 
  * @param string $content Shortcode content.
  * @return string|void HTML content to display audio.
  */
-function wp_audio_shortcode( $attr, $content = '' ) {
+function wp_audio_shortcode($attr, $content = '') {
 	$post_id = get_post() ? get_the_ID() : 0;
 
 	static $instance = 0;
@@ -2210,8 +2210,8 @@ 
 	 * @param string $content  Shortcode content.
 	 * @param int    $instance Unique numeric ID of this audio shortcode instance.
 	 */
-	$override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instance );
-	if ( '' !== $override ) {
+	$override = apply_filters('wp_audio_shortcode_override', '', $attr, $content, $instance);
+	if ('' !== $override) {
 		return $override;
 	}
 
@@ -2226,44 +2226,44 @@ 
 		'class'    => 'wp-audio-shortcode',
 		'style'    => 'width: 100%;'
 	);
-	foreach ( $default_types as $type ) {
+	foreach ($default_types as $type) {
 		$defaults_atts[$type] = '';
 	}
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
+	$atts = shortcode_atts($defaults_atts, $attr, 'audio');
 
 	$primary = false;
-	if ( ! empty( $atts['src'] ) ) {
-		$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
-		if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
-			return sprintf( '<a class="wp-embedded-audio" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+	if ( ! empty($atts['src'])) {
+		$type = wp_check_filetype($atts['src'], wp_get_mime_types());
+		if ( ! in_array(strtolower($type['ext']), $default_types)) {
+			return sprintf('<a class="wp-embedded-audio" href="%s">%s</a>', esc_url($atts['src']), esc_html($atts['src']));
 		}
 		$primary = true;
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	} else {
-		foreach ( $default_types as $ext ) {
-			if ( ! empty( $atts[ $ext ] ) ) {
-				$type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
-				if ( strtolower( $type['ext'] ) === $ext ) {
+		foreach ($default_types as $ext) {
+			if ( ! empty($atts[$ext])) {
+				$type = wp_check_filetype($atts[$ext], wp_get_mime_types());
+				if (strtolower($type['ext']) === $ext) {
 					$primary = true;
 				}
 			}
 		}
 	}
 
-	if ( ! $primary ) {
-		$audios = get_attached_media( 'audio', $post_id );
-		if ( empty( $audios ) ) {
+	if ( ! $primary) {
+		$audios = get_attached_media('audio', $post_id);
+		if (empty($audios)) {
 			return;
 		}
 
-		$audio = reset( $audios );
-		$atts['src'] = wp_get_attachment_url( $audio->ID );
-		if ( empty( $atts['src'] ) ) {
+		$audio = reset($audios);
+		$atts['src'] = wp_get_attachment_url($audio->ID);
+		if (empty($atts['src'])) {
 			return;
 		}
 
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	}
 
 	/**
@@ -2273,10 +2273,10 @@ 
 	 *
 	 * @param string $library Media library used for the audio shortcode.
 	 */
-	$library = apply_filters( 'wp_audio_shortcode_library', 'mediaelement' );
-	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
-		wp_enqueue_style( 'wp-mediaelement' );
-		wp_enqueue_script( 'wp-mediaelement' );
+	$library = apply_filters('wp_audio_shortcode_library', 'mediaelement');
+	if ('mediaelement' === $library && did_action('init')) {
+		wp_enqueue_style('wp-mediaelement');
+		wp_enqueue_script('wp-mediaelement');
 	}
 
 	/**
@@ -2286,50 +2286,50 @@ 
 	 *
 	 * @param string $class CSS class or list of space-separated classes.
 	 */
-	$atts['class'] = apply_filters( 'wp_audio_shortcode_class', $atts['class'] );
+	$atts['class'] = apply_filters('wp_audio_shortcode_class', $atts['class']);
 
 	$html_atts = array(
 		'class'    => $atts['class'],
-		'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
-		'loop'     => wp_validate_boolean( $atts['loop'] ),
-		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+		'id'       => sprintf('audio-%d-%d', $post_id, $instance),
+		'loop'     => wp_validate_boolean($atts['loop']),
+		'autoplay' => wp_validate_boolean($atts['autoplay']),
 		'preload'  => $atts['preload'],
 		'style'    => $atts['style'],
 	);
 
 	// These ones should just be omitted altogether if they are blank
-	foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+	foreach (array('loop', 'autoplay', 'preload') as $a) {
+		if (empty($html_atts[$a])) {
+			unset($html_atts[$a]);
 		}
 	}
 
 	$attr_strings = array();
-	foreach ( $html_atts as $k => $v ) {
-		$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
+	foreach ($html_atts as $k => $v) {
+		$attr_strings[] = $k.'="'.esc_attr($v).'"';
 	}
 
 	$html = '';
-	if ( 'mediaelement' === $library && 1 === $instance ) {
+	if ('mediaelement' === $library && 1 === $instance) {
 		$html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\n";
 	}
-	$html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
+	$html .= sprintf('<audio %s controls="controls">', join(' ', $attr_strings));
 
 	$fileurl = '';
 	$source = '<source type="%s" src="%s" />';
-	foreach ( $default_types as $fallback ) {
-		if ( ! empty( $atts[ $fallback ] ) ) {
-			if ( empty( $fileurl ) ) {
-				$fileurl = $atts[ $fallback ];
+	foreach ($default_types as $fallback) {
+		if ( ! empty($atts[$fallback])) {
+			if (empty($fileurl)) {
+				$fileurl = $atts[$fallback];
 			}
-			$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
-			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
+			$type = wp_check_filetype($atts[$fallback], wp_get_mime_types());
+			$url = add_query_arg('_', $instance, $atts[$fallback]);
+			$html .= sprintf($source, $type['type'], esc_url($url));
 		}
 	}
 
-	if ( 'mediaelement' === $library ) {
-		$html .= wp_mediaelement_fallback( $fileurl );
+	if ('mediaelement' === $library) {
+		$html .= wp_mediaelement_fallback($fileurl);
 	}
 	$html .= '</audio>';
 
@@ -2344,9 +2344,9 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $library Media library used for the audio shortcode.
 	 */
-	return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
+	return apply_filters('wp_audio_shortcode', $html, $atts, $audio, $post_id, $library);
 }
-add_shortcode( 'audio', 'wp_audio_shortcode' );
+add_shortcode('audio', 'wp_audio_shortcode');
 
 /**
  * Returns a filtered list of WP-supported video formats.
@@ -2364,7 +2364,7 @@ 
 	 * @param array $extensions An array of support video formats. Defaults are
 	 *                          'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'.
 	 */
-	return apply_filters( 'wp_video_extensions', array( 'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv' ) );
+	return apply_filters('wp_video_extensions', array('mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'));
 }
 
 /**
@@ -2395,7 +2395,7 @@ 
  * @param string $content Shortcode content.
  * @return string|void HTML content to display video.
  */
-function wp_video_shortcode( $attr, $content = '' ) {
+function wp_video_shortcode($attr, $content = '') {
 	global $content_width;
 	$post_id = get_post() ? get_the_ID() : 0;
 
@@ -2417,8 +2417,8 @@ 
 	 * @param string $content  Video shortcode content.
 	 * @param int    $instance Unique numeric ID of this video shortcode instance.
 	 */
-	$override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance );
-	if ( '' !== $override ) {
+	$override = apply_filters('wp_video_shortcode_override', '', $attr, $content, $instance);
+	if ('' !== $override) {
 		return $override;
 	}
 
@@ -2436,22 +2436,22 @@ 
 		'class'    => 'wp-video-shortcode',
 	);
 
-	foreach ( $default_types as $type ) {
+	foreach ($default_types as $type) {
 		$defaults_atts[$type] = '';
 	}
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
+	$atts = shortcode_atts($defaults_atts, $attr, 'video');
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		// shrink the video so it isn't huge in the admin
-		if ( $atts['width'] > $defaults_atts['width'] ) {
-			$atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] );
+		if ($atts['width'] > $defaults_atts['width']) {
+			$atts['height'] = round(($atts['height'] * $defaults_atts['width']) / $atts['width']);
 			$atts['width'] = $defaults_atts['width'];
 		}
 	} else {
 		// if the video is bigger than the theme
-		if ( ! empty( $content_width ) && $atts['width'] > $content_width ) {
-			$atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] );
+		if ( ! empty($content_width) && $atts['width'] > $content_width) {
+			$atts['height'] = round(($atts['height'] * $content_width) / $atts['width']);
 			$atts['width'] = $content_width;
 		}
 	}
@@ -2461,46 +2461,46 @@ 
 	$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
 
 	$primary = false;
-	if ( ! empty( $atts['src'] ) ) {
-		$is_vimeo = ( preg_match( $vimeo_pattern, $atts['src'] ) );
-		$is_youtube = (  preg_match( $yt_pattern, $atts['src'] ) );
-		if ( ! $is_youtube && ! $is_vimeo ) {
-			$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
-			if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
-				return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+	if ( ! empty($atts['src'])) {
+		$is_vimeo = (preg_match($vimeo_pattern, $atts['src']));
+		$is_youtube = (preg_match($yt_pattern, $atts['src']));
+		if ( ! $is_youtube && ! $is_vimeo) {
+			$type = wp_check_filetype($atts['src'], wp_get_mime_types());
+			if ( ! in_array(strtolower($type['ext']), $default_types)) {
+				return sprintf('<a class="wp-embedded-video" href="%s">%s</a>', esc_url($atts['src']), esc_html($atts['src']));
 			}
 		}
 
-		if ( $is_vimeo ) {
-			wp_enqueue_script( 'froogaloop' );
+		if ($is_vimeo) {
+			wp_enqueue_script('froogaloop');
 		}
 
 		$primary = true;
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	} else {
-		foreach ( $default_types as $ext ) {
-			if ( ! empty( $atts[ $ext ] ) ) {
-				$type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
-				if ( strtolower( $type['ext'] ) === $ext ) {
+		foreach ($default_types as $ext) {
+			if ( ! empty($atts[$ext])) {
+				$type = wp_check_filetype($atts[$ext], wp_get_mime_types());
+				if (strtolower($type['ext']) === $ext) {
 					$primary = true;
 				}
 			}
 		}
 	}
 
-	if ( ! $primary ) {
-		$videos = get_attached_media( 'video', $post_id );
-		if ( empty( $videos ) ) {
+	if ( ! $primary) {
+		$videos = get_attached_media('video', $post_id);
+		if (empty($videos)) {
 			return;
 		}
 
-		$video = reset( $videos );
-		$atts['src'] = wp_get_attachment_url( $video->ID );
-		if ( empty( $atts['src'] ) ) {
+		$video = reset($videos);
+		$atts['src'] = wp_get_attachment_url($video->ID);
+		if (empty($atts['src'])) {
 			return;
 		}
 
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	}
 
 	/**
@@ -2510,10 +2510,10 @@ 
 	 *
 	 * @param string $library Media library used for the video shortcode.
 	 */
-	$library = apply_filters( 'wp_video_shortcode_library', 'mediaelement' );
-	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
-		wp_enqueue_style( 'wp-mediaelement' );
-		wp_enqueue_script( 'wp-mediaelement' );
+	$library = apply_filters('wp_video_shortcode_library', 'mediaelement');
+	if ('mediaelement' === $library && did_action('init')) {
+		wp_enqueue_style('wp-mediaelement');
+		wp_enqueue_script('wp-mediaelement');
 	}
 
 	/**
@@ -2523,73 +2523,73 @@ 
 	 *
 	 * @param string $class CSS class or list of space-separated classes.
 	 */
-	$atts['class'] = apply_filters( 'wp_video_shortcode_class', $atts['class'] );
+	$atts['class'] = apply_filters('wp_video_shortcode_class', $atts['class']);
 
 	$html_atts = array(
 		'class'    => $atts['class'],
-		'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
-		'width'    => absint( $atts['width'] ),
-		'height'   => absint( $atts['height'] ),
-		'poster'   => esc_url( $atts['poster'] ),
-		'loop'     => wp_validate_boolean( $atts['loop'] ),
-		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+		'id'       => sprintf('video-%d-%d', $post_id, $instance),
+		'width'    => absint($atts['width']),
+		'height'   => absint($atts['height']),
+		'poster'   => esc_url($atts['poster']),
+		'loop'     => wp_validate_boolean($atts['loop']),
+		'autoplay' => wp_validate_boolean($atts['autoplay']),
 		'preload'  => $atts['preload'],
 	);
 
 	// These ones should just be omitted altogether if they are blank
-	foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+	foreach (array('poster', 'loop', 'autoplay', 'preload') as $a) {
+		if (empty($html_atts[$a])) {
+			unset($html_atts[$a]);
 		}
 	}
 
 	$attr_strings = array();
-	foreach ( $html_atts as $k => $v ) {
-		$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
+	foreach ($html_atts as $k => $v) {
+		$attr_strings[] = $k.'="'.esc_attr($v).'"';
 	}
 
 	$html = '';
-	if ( 'mediaelement' === $library && 1 === $instance ) {
+	if ('mediaelement' === $library && 1 === $instance) {
 		$html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
 	}
-	$html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
+	$html .= sprintf('<video %s controls="controls">', join(' ', $attr_strings));
 
 	$fileurl = '';
 	$source = '<source type="%s" src="%s" />';
-	foreach ( $default_types as $fallback ) {
-		if ( ! empty( $atts[ $fallback ] ) ) {
-			if ( empty( $fileurl ) ) {
-				$fileurl = $atts[ $fallback ];
+	foreach ($default_types as $fallback) {
+		if ( ! empty($atts[$fallback])) {
+			if (empty($fileurl)) {
+				$fileurl = $atts[$fallback];
 			}
-			if ( 'src' === $fallback && $is_youtube ) {
-				$type = array( 'type' => 'video/youtube' );
-			} elseif ( 'src' === $fallback && $is_vimeo ) {
-				$type = array( 'type' => 'video/vimeo' );
+			if ('src' === $fallback && $is_youtube) {
+				$type = array('type' => 'video/youtube');
+			} elseif ('src' === $fallback && $is_vimeo) {
+				$type = array('type' => 'video/vimeo');
 			} else {
-				$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
+				$type = wp_check_filetype($atts[$fallback], wp_get_mime_types());
 			}
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
-			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
+			$url = add_query_arg('_', $instance, $atts[$fallback]);
+			$html .= sprintf($source, $type['type'], esc_url($url));
 		}
 	}
 
-	if ( ! empty( $content ) ) {
-		if ( false !== strpos( $content, "\n" ) ) {
-			$content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
+	if ( ! empty($content)) {
+		if (false !== strpos($content, "\n")) {
+			$content = str_replace(array("\r\n", "\n", "\t"), '', $content);
 		}
-		$html .= trim( $content );
+		$html .= trim($content);
 	}
 
-	if ( 'mediaelement' === $library ) {
-		$html .= wp_mediaelement_fallback( $fileurl );
+	if ('mediaelement' === $library) {
+		$html .= wp_mediaelement_fallback($fileurl);
 	}
 	$html .= '</video>';
 
 	$width_rule = '';
-	if ( ! empty( $atts['width'] ) ) {
-		$width_rule = sprintf( 'width: %dpx; ', $atts['width'] );
+	if ( ! empty($atts['width'])) {
+		$width_rule = sprintf('width: %dpx; ', $atts['width']);
 	}
-	$output = sprintf( '<div style="%s" class="wp-video">%s</div>', $width_rule, $html );
+	$output = sprintf('<div style="%s" class="wp-video">%s</div>', $width_rule, $html);
 
 	/**
 	 * Filters the output of the video shortcode.
@@ -2602,9 +2602,9 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $library Media library used for the video shortcode.
 	 */
-	return apply_filters( 'wp_video_shortcode', $output, $atts, $video, $post_id, $library );
+	return apply_filters('wp_video_shortcode', $output, $atts, $video, $post_id, $library);
 }
-add_shortcode( 'video', 'wp_video_shortcode' );
+add_shortcode('video', 'wp_video_shortcode');
 
 /**
  * Displays previous image link that has the same post parent.
@@ -2618,7 +2618,7 @@ 
  *                           default to 'post_title' or `$text`. Default 'thumbnail'.
  * @param string       $text Optional. Link text. Default false.
  */
-function previous_image_link( $size = 'thumbnail', $text = false ) {
+function previous_image_link($size = 'thumbnail', $text = false) {
 	adjacent_image_link(true, $size, $text);
 }
 
@@ -2634,7 +2634,7 @@ 
  *                           default to 'post_title' or `$text`. Default 'thumbnail'.
  * @param string       $text Optional. Link text. Default false.
  */
-function next_image_link( $size = 'thumbnail', $text = false ) {
+function next_image_link($size = 'thumbnail', $text = false) {
 	adjacent_image_link(false, $size, $text);
 }
 
@@ -2650,12 +2650,12 @@ 
  *                           values in pixels (in that order). Default 'thumbnail'.
  * @param bool         $text Optional. Link text. Default false.
  */
-function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false ) {
+function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
 	$post = get_post();
-	$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+	$attachments = array_values(get_children(array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID')));
 
-	foreach ( $attachments as $k => $attachment ) {
-		if ( $attachment->ID == $post->ID ) {
+	foreach ($attachments as $k => $attachment) {
+		if ($attachment->ID == $post->ID) {
 			break;
 		}
 	}
@@ -2663,12 +2663,12 @@ 
 	$output = '';
 	$attachment_id = 0;
 
-	if ( $attachments ) {
+	if ($attachments) {
 		$k = $prev ? $k - 1 : $k + 1;
 
-		if ( isset( $attachments[ $k ] ) ) {
-			$attachment_id = $attachments[ $k ]->ID;
-			$output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+		if (isset($attachments[$k])) {
+			$attachment_id = $attachments[$k]->ID;
+			$output = wp_get_attachment_link($attachment_id, $size, true, false, $text);
 		}
 	}
 
@@ -2687,7 +2687,7 @@ 
 	 * @param string $size          Image size.
 	 * @param string $text          Link text.
 	 */
-	echo apply_filters( "{$adjacent}_image_link", $output, $attachment_id, $size, $text );
+	echo apply_filters("{$adjacent}_image_link", $output, $attachment_id, $size, $text);
 }
 
 /**
@@ -2698,33 +2698,33 @@ 
  * @param int|array|object $attachment Attachment ID, data array, or data object.
  * @return array Empty array on failure. List of taxonomies on success.
  */
-function get_attachment_taxonomies( $attachment ) {
-	if ( is_int( $attachment ) ) {
-		$attachment = get_post( $attachment );
-	} elseif ( is_array( $attachment ) ) {
+function get_attachment_taxonomies($attachment) {
+	if (is_int($attachment)) {
+		$attachment = get_post($attachment);
+	} elseif (is_array($attachment)) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
+	if ( ! is_object($attachment))
 		return array();
 
-	$file = get_attached_file( $attachment->ID );
-	$filename = basename( $file );
+	$file = get_attached_file($attachment->ID);
+	$filename = basename($file);
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
-	if ( !empty($attachment->post_mime_type) ) {
-		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
-				if ( !empty($token) )
+	if (false !== strpos($filename, '.'))
+		$objects[] = 'attachment:'.substr($filename, strrpos($filename, '.') + 1);
+	if ( ! empty($attachment->post_mime_type)) {
+		$objects[] = 'attachment:'.$attachment->post_mime_type;
+		if (false !== strpos($attachment->post_mime_type, '/'))
+			foreach (explode('/', $attachment->post_mime_type) as $token)
+				if ( ! empty($token))
 					$objects[] = "attachment:$token";
 	}
 
 	$taxonomies = array();
-	foreach ( $objects as $object )
-		if ( $taxes = get_object_taxonomies($object) )
+	foreach ($objects as $object)
+		if ($taxes = get_object_taxonomies($object))
 			$taxonomies = array_merge($taxonomies, $taxes);
 
 	return array_unique($taxonomies);
@@ -2743,15 +2743,15 @@ 
  *                       Default 'names'.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_taxonomies_for_attachments( $output = 'names' ) {
+function get_taxonomies_for_attachments($output = 'names') {
 	$taxonomies = array();
-	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
-		foreach ( $taxonomy->object_type as $object_type ) {
-			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
+	foreach (get_taxonomies(array(), 'objects') as $taxonomy) {
+		foreach ($taxonomy->object_type as $object_type) {
+			if ('attachment' == $object_type || 0 === strpos($object_type, 'attachment:')) {
+				if ('names' == $output)
 					$taxonomies[] = $taxonomy->name;
 				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+					$taxonomies[$taxonomy->name] = $taxonomy;
 				break;
 			}
 		}
@@ -2773,7 +2773,7 @@ 
  */
 function wp_imagecreatetruecolor($width, $height) {
 	$img = imagecreatetruecolor($width, $height);
-	if ( is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
+	if (is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha')) {
 		imagealphablending($img, false);
 		imagesavealpha($img, true);
 	}
@@ -2793,13 +2793,13 @@ 
  * @param int $max_height     The maximum allowed height.
  * @return array The maximum possible width and height based on the example ratio.
  */
-function wp_expand_dimensions( $example_width, $example_height, $max_width, $max_height ) {
+function wp_expand_dimensions($example_width, $example_height, $max_width, $max_height) {
 	$example_width  = (int) $example_width;
 	$example_height = (int) $example_height;
 	$max_width      = (int) $max_width;
 	$max_height     = (int) $max_height;
 
-	return wp_constrain_dimensions( $example_width * 1000000, $example_height * 1000000, $max_width, $max_height );
+	return wp_constrain_dimensions($example_width * 1000000, $example_height * 1000000, $max_width, $max_height);
 }
 
 /**
@@ -2810,8 +2810,8 @@ 
  * @return int Allowed upload size.
  */
 function wp_max_upload_size() {
-	$u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
-	$p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
+	$u_bytes = wp_convert_hr_to_bytes(ini_get('upload_max_filesize'));
+	$p_bytes = wp_convert_hr_to_bytes(ini_get('post_max_size'));
 
 	/**
 	 * Filters the maximum upload size allowed in php.ini.
@@ -2822,7 +2822,7 @@ 
 	 * @param int $u_bytes Maximum upload filesize in bytes.
 	 * @param int $p_bytes Maximum size of POST data in bytes.
 	 */
-	return apply_filters( 'upload_size_limit', min( $u_bytes, $p_bytes ), $u_bytes, $p_bytes );
+	return apply_filters('upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes);
 }
 
 /**
@@ -2836,31 +2836,31 @@ 
  * @return WP_Image_Editor|WP_Error The WP_Image_Editor object if successful, an WP_Error
  *                                  object otherwise.
  */
-function wp_get_image_editor( $path, $args = array() ) {
+function wp_get_image_editor($path, $args = array()) {
 	$args['path'] = $path;
 
-	if ( ! isset( $args['mime_type'] ) ) {
-		$file_info = wp_check_filetype( $args['path'] );
+	if ( ! isset($args['mime_type'])) {
+		$file_info = wp_check_filetype($args['path']);
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
+		if (isset($file_info) && $file_info['type'])
 			$args['mime_type'] = $file_info['type'];
 	}
 
-	$implementation = _wp_image_editor_choose( $args );
+	$implementation = _wp_image_editor_choose($args);
 
-	if ( $implementation ) {
-		$editor = new $implementation( $path );
+	if ($implementation) {
+		$editor = new $implementation($path);
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
+		if (is_wp_error($loaded))
 			return $loaded;
 
 		return $editor;
 	}
 
-	return new WP_Error( 'image_no_editor', __('No editor could be selected.') );
+	return new WP_Error('image_no_editor', __('No editor could be selected.'));
 }
 
 /**
@@ -2872,8 +2872,8 @@ 
  *                           Default empty array.
  * @return bool True if an eligible editor is found; false otherwise.
  */
-function wp_image_editor_supports( $args = array() ) {
-	return (bool) _wp_image_editor_choose( $args );
+function wp_image_editor_supports($args = array()) {
+	return (bool) _wp_image_editor_choose($args);
 }
 
 /**
@@ -2886,10 +2886,10 @@ 
  * @return string|false Class name for the first editor that claims to support the request. False if no
  *                     editor claims to support the request.
  */
-function _wp_image_editor_choose( $args = array() ) {
-	require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
-	require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
-	require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
+function _wp_image_editor_choose($args = array()) {
+	require_once ABSPATH.WPINC.'/class-wp-image-editor.php';
+	require_once ABSPATH.WPINC.'/class-wp-image-editor-gd.php';
+	require_once ABSPATH.WPINC.'/class-wp-image-editor-imagick.php';
 
 	/**
 	 * Filters the list of image editing library classes.
@@ -2899,21 +2899,21 @@ 
 	 * @param array $image_editors List of available image editors. Defaults are
 	 *                             'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'.
 	 */
-	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
+	$implementations = apply_filters('wp_image_editors', array('WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'));
 
-	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
+	foreach ($implementations as $implementation) {
+		if ( ! call_user_func(array($implementation, 'test'), $args))
 			continue;
 
-		if ( isset( $args['mime_type'] ) &&
+		if (isset($args['mime_type']) &&
 			! call_user_func(
-				array( $implementation, 'supports_mime_type' ),
-				$args['mime_type'] ) ) {
+				array($implementation, 'supports_mime_type'),
+				$args['mime_type'] )) {
 			continue;
 		}
 
-		if ( isset( $args['methods'] ) &&
-			 array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+		if (isset($args['methods']) &&
+			 array_diff($args['methods'], get_class_methods($implementation))) {
 			continue;
 		}
 
@@ -2931,33 +2931,33 @@ 
 function wp_plupload_default_settings() {
 	$wp_scripts = wp_scripts();
 
-	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
+	$data = $wp_scripts->get_data('wp-plupload', 'data');
+	if ($data && false !== strpos($data, '_wpPluploadSettings'))
 		return;
 
 	$max_upload_size = wp_max_upload_size();
-	$allowed_extensions = array_keys( get_allowed_mime_types() );
+	$allowed_extensions = array_keys(get_allowed_mime_types());
 	$extensions = array();
-	foreach ( $allowed_extensions as $extension ) {
-		$extensions = array_merge( $extensions, explode( '|', $extension ) );
+	foreach ($allowed_extensions as $extension) {
+		$extensions = array_merge($extensions, explode('|', $extension));
 	}
 
 	$defaults = array(
 		'runtimes'            => 'html5,flash,silverlight,html4',
 		'file_data_name'      => 'async-upload', // key passed to $_FILE.
-		'url'                 => admin_url( 'async-upload.php', 'relative' ),
-		'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
-		'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
+		'url'                 => admin_url('async-upload.php', 'relative'),
+		'flash_swf_url'       => includes_url('js/plupload/plupload.flash.swf'),
+		'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
 		'filters' => array(
-			'max_file_size'   => $max_upload_size . 'b',
-			'mime_types'      => array( array( 'extensions' => implode( ',', $extensions ) ) ),
+			'max_file_size'   => $max_upload_size.'b',
+			'mime_types'      => array(array('extensions' => implode(',', $extensions))),
 		),
 	);
 
 	// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
 	// when enabled. See #29602.
-	if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-		strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+	if (wp_is_mobile() && strpos($_SERVER['HTTP_USER_AGENT'], 'OS 7_') !== false &&
+		strpos($_SERVER['HTTP_USER_AGENT'], 'like Mac OS X') !== false) {
 
 		$defaults['multi_selection'] = false;
 	}
@@ -2969,7 +2969,7 @@ 
 	 *
 	 * @param array $defaults Default Plupload settings array.
 	 */
-	$defaults = apply_filters( 'plupload_default_settings', $defaults );
+	$defaults = apply_filters('plupload_default_settings', $defaults);
 
 	$params = array(
 		'action' => 'upload-attachment',
@@ -2982,8 +2982,8 @@ 
 	 *
 	 * @param array $params Default Plupload parameters array.
 	 */
-	$params = apply_filters( 'plupload_default_params', $params );
-	$params['_wpnonce'] = wp_create_nonce( 'media-form' );
+	$params = apply_filters('plupload_default_params', $params);
+	$params['_wpnonce'] = wp_create_nonce('media-form');
 	$defaults['multipart_params'] = $params;
 
 	$settings = array(
@@ -2995,12 +2995,12 @@ 
 		'limitExceeded' => is_multisite() && ! is_upload_space_available()
 	);
 
-	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
+	$script = 'var _wpPluploadSettings = '.wp_json_encode($settings).';';
 
-	if ( $data )
+	if ($data)
 		$script = "$data\n$script";
 
-	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
+	$wp_scripts->add_data('wp-plupload', 'data', $script);
 }
 
 /**
@@ -3012,42 +3012,42 @@ 
  * @param mixed $attachment Attachment ID or object.
  * @return array|void Array of attachment details.
  */
-function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
+function wp_prepare_attachment_for_js($attachment) {
+	if ( ! $attachment = get_post($attachment))
 		return;
 
-	if ( 'attachment' != $attachment->post_type )
+	if ('attachment' != $attachment->post_type)
 		return;
 
-	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	$meta = wp_get_attachment_metadata($attachment->ID);
+	if (false !== strpos($attachment->post_mime_type, '/'))
+		list($type, $subtype) = explode('/', $attachment->post_mime_type);
 	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+		list($type, $subtype) = array($attachment->post_mime_type, '');
 
-	$attachment_url = wp_get_attachment_url( $attachment->ID );
+	$attachment_url = wp_get_attachment_url($attachment->ID);
 
 	$response = array(
 		'id'          => $attachment->ID,
 		'title'       => $attachment->post_title,
-		'filename'    => wp_basename( get_attached_file( $attachment->ID ) ),
+		'filename'    => wp_basename(get_attached_file($attachment->ID)),
 		'url'         => $attachment_url,
-		'link'        => get_attachment_link( $attachment->ID ),
-		'alt'         => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
+		'link'        => get_attachment_link($attachment->ID),
+		'alt'         => get_post_meta($attachment->ID, '_wp_attachment_image_alt', true),
 		'author'      => $attachment->post_author,
 		'description' => $attachment->post_content,
 		'caption'     => $attachment->post_excerpt,
 		'name'        => $attachment->post_name,
 		'status'      => $attachment->post_status,
 		'uploadedTo'  => $attachment->post_parent,
-		'date'        => strtotime( $attachment->post_date_gmt ) * 1000,
-		'modified'    => strtotime( $attachment->post_modified_gmt ) * 1000,
+		'date'        => strtotime($attachment->post_date_gmt) * 1000,
+		'modified'    => strtotime($attachment->post_modified_gmt) * 1000,
 		'menuOrder'   => $attachment->menu_order,
 		'mime'        => $attachment->post_mime_type,
 		'type'        => $type,
 		'subtype'     => $subtype,
-		'icon'        => wp_mime_type_icon( $attachment->ID ),
-		'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ),
+		'icon'        => wp_mime_type_icon($attachment->ID),
+		'dateFormatted' => mysql2date(__('F j, Y'), $attachment->post_date),
 		'nonces'      => array(
 			'update' => false,
 			'delete' => false,
@@ -3057,145 +3057,145 @@ 
 		'meta'       => false,
 	);
 
-	$author = new WP_User( $attachment->post_author );
+	$author = new WP_User($attachment->post_author);
 	$response['authorName'] = $author->display_name;
 
-	if ( $attachment->post_parent ) {
-		$post_parent = get_post( $attachment->post_parent );
+	if ($attachment->post_parent) {
+		$post_parent = get_post($attachment->post_parent);
 	} else {
 		$post_parent = false;
 	}
 
-	if ( $post_parent ) {
-		$parent_type = get_post_type_object( $post_parent->post_type );
+	if ($post_parent) {
+		$parent_type = get_post_type_object($post_parent->post_type);
 
-		if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) {
-			$response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
+		if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $attachment->post_parent)) {
+			$response['uploadedToLink'] = get_edit_post_link($attachment->post_parent, 'raw');
 		}
 
-		if ( $parent_type && current_user_can( 'read_post', $attachment->post_parent ) ) {
-			$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
+		if ($parent_type && current_user_can('read_post', $attachment->post_parent)) {
+			$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __('(no title)');
 		}
 	}
 
-	$attached_file = get_attached_file( $attachment->ID );
+	$attached_file = get_attached_file($attachment->ID);
 
-	if ( isset( $meta['filesize'] ) ) {
+	if (isset($meta['filesize'])) {
 		$bytes = $meta['filesize'];
-	} elseif ( file_exists( $attached_file ) ) {
-		$bytes = filesize( $attached_file );
+	} elseif (file_exists($attached_file)) {
+		$bytes = filesize($attached_file);
 	} else {
 		$bytes = '';
 	}
 
-	if ( $bytes ) {
+	if ($bytes) {
 		$response['filesizeInBytes'] = $bytes;
-		$response['filesizeHumanReadable'] = size_format( $bytes );
+		$response['filesizeHumanReadable'] = size_format($bytes);
 	}
 
-	if ( current_user_can( 'edit_post', $attachment->ID ) ) {
-		$response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
-		$response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );
-		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
+	if (current_user_can('edit_post', $attachment->ID)) {
+		$response['nonces']['update'] = wp_create_nonce('update-post_'.$attachment->ID);
+		$response['nonces']['edit'] = wp_create_nonce('image_editor-'.$attachment->ID);
+		$response['editLink'] = get_edit_post_link($attachment->ID, 'raw');
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if (current_user_can('delete_post', $attachment->ID))
+		$response['nonces']['delete'] = wp_create_nonce('delete-post_'.$attachment->ID);
 
-	if ( $meta && 'image' === $type ) {
+	if ($meta && 'image' === $type) {
 		$sizes = array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$possible_sizes = apply_filters( 'image_size_names_choose', array(
+		$possible_sizes = apply_filters('image_size_names_choose', array(
 			'thumbnail' => __('Thumbnail'),
 			'medium'    => __('Medium'),
 			'large'     => __('Large'),
 			'full'      => __('Full Size'),
-		) );
-		unset( $possible_sizes['full'] );
+		));
+		unset($possible_sizes['full']);
 
 		// Loop through all potential sizes that may be chosen. Try to do this with some efficiency.
 		// First: run the image_downsize filter. If it returns something, we can use its data.
 		// If the filter does not return something, then image_downsize() is just an expensive
 		// way to check the image metadata, which we do second.
-		foreach ( $possible_sizes as $size => $label ) {
+		foreach ($possible_sizes as $size => $label) {
 
 			/** This filter is documented in wp-includes/media.php */
-			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
+			if ($downsize = apply_filters('image_downsize', false, $attachment->ID, $size)) {
+				if ( ! $downsize[3])
 					continue;
-				$sizes[ $size ] = array(
+				$sizes[$size] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
 					'url'         => $downsize[0],
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
-			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+			} elseif (isset($meta['sizes'][$size])) {
+				if ( ! isset($base_url))
+					$base_url = str_replace(wp_basename($attachment_url), '', $attachment_url);
 
 				// Nothing from the filter, so consult image metadata if we have it.
-				$size_meta = $meta['sizes'][ $size ];
+				$size_meta = $meta['sizes'][$size];
 
 				// We have the actual image size, but might need to further constrain it if content_width is narrower.
 				// Thumbnail, medium, and full sizes are also checked against the site's height/width options.
-				list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
+				list($width, $height) = image_constrain_size_for_editor($size_meta['width'], $size_meta['height'], $size, 'edit');
 
-				$sizes[ $size ] = array(
+				$sizes[$size] = array(
 					'height'      => $height,
 					'width'       => $width,
-					'url'         => $base_url . $size_meta['file'],
+					'url'         => $base_url.$size_meta['file'],
 					'orientation' => $height > $width ? 'portrait' : 'landscape',
 				);
 			}
 		}
 
-		$sizes['full'] = array( 'url' => $attachment_url );
+		$sizes['full'] = array('url' => $attachment_url);
 
-		if ( isset( $meta['height'], $meta['width'] ) ) {
+		if (isset($meta['height'], $meta['width'])) {
 			$sizes['full']['height'] = $meta['height'];
 			$sizes['full']['width'] = $meta['width'];
 			$sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
 		}
 
-		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-	} elseif ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
+		$response = array_merge($response, array('sizes' => $sizes), $sizes['full']);
+	} elseif ($meta && 'video' === $type) {
+		if (isset($meta['width']))
 			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
+		if (isset($meta['height']))
 			$response['height'] = (int) $meta['height'];
 	}
 
-	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
+	if ($meta && ('audio' === $type || 'video' === $type)) {
+		if (isset($meta['length_formatted']))
 			$response['fileLength'] = $meta['length_formatted'];
 
 		$response['meta'] = array();
-		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
-			$response['meta'][ $key ] = false;
+		foreach (wp_get_attachment_id3_keys($attachment, 'js') as $key => $label) {
+			$response['meta'][$key] = false;
 
-			if ( ! empty( $meta[ $key ] ) ) {
-				$response['meta'][ $key ] = $meta[ $key ];
+			if ( ! empty($meta[$key])) {
+				$response['meta'][$key] = $meta[$key];
 			}
 		}
 
-		$id = get_post_thumbnail_id( $attachment->ID );
-		if ( ! empty( $id ) ) {
-			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'full' );
-			$response['image'] = compact( 'src', 'width', 'height' );
-			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'thumbnail' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+		$id = get_post_thumbnail_id($attachment->ID);
+		if ( ! empty($id)) {
+			list($src, $width, $height) = wp_get_attachment_image_src($id, 'full');
+			$response['image'] = compact('src', 'width', 'height');
+			list($src, $width, $height) = wp_get_attachment_image_src($id, 'thumbnail');
+			$response['thumb'] = compact('src', 'width', 'height');
 		} else {
-			$src = wp_mime_type_icon( $attachment->ID );
+			$src = wp_mime_type_icon($attachment->ID);
 			$width = 48;
 			$height = 64;
-			$response['image'] = compact( 'src', 'width', 'height' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+			$response['image'] = compact('src', 'width', 'height');
+			$response['thumb'] = compact('src', 'width', 'height');
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if (function_exists('get_compat_media_markup'))
+		$response['compat'] = get_compat_media_markup($attachment->ID, array('in_modal' => true));
 
 	/**
 	 * Filters the attachment data prepared for JavaScript.
@@ -3206,7 +3206,7 @@ 
 	 * @param int|object $attachment Attachment ID or object.
 	 * @param array      $meta       Array of attachment meta data.
 	 */
-	return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );
+	return apply_filters('wp_prepare_attachment_for_js', $response, $attachment, $meta);
 }
 
 /**
@@ -3225,9 +3225,9 @@ 
  *     @type int|WP_Post A post object or ID.
  * }
  */
-function wp_enqueue_media( $args = array() ) {
+function wp_enqueue_media($args = array()) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
+	if (did_action('wp_enqueue_media'))
 		return;
 
 	global $content_width, $wpdb, $wp_locale;
@@ -3235,7 +3235,7 @@ 
 	$defaults = array(
 		'post' => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	// We're going to pass the old thickbox media tabs to `media_upload_tabs`
 	// to ensure plugins will work. We will then unset those tabs.
@@ -3248,67 +3248,67 @@ 
 	);
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$tabs = apply_filters( 'media_upload_tabs', $tabs );
-	unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
+	$tabs = apply_filters('media_upload_tabs', $tabs);
+	unset($tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library']);
 
 	$props = array(
-		'link'  => get_option( 'image_default_link_type' ), // db default is 'file'
-		'align' => get_option( 'image_default_align' ), // empty default
-		'size'  => get_option( 'image_default_size' ),  // empty default
+		'link'  => get_option('image_default_link_type'), // db default is 'file'
+		'align' => get_option('image_default_align'), // empty default
+		'size'  => get_option('image_default_size'), // empty default
 	);
 
-	$exts = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );
+	$exts = array_merge(wp_get_audio_extensions(), wp_get_video_extensions());
 	$mimes = get_allowed_mime_types();
 	$ext_mimes = array();
-	foreach ( $exts as $ext ) {
-		foreach ( $mimes as $ext_preg => $mime_match ) {
-			if ( preg_match( '#' . $ext . '#i', $ext_preg ) ) {
-				$ext_mimes[ $ext ] = $mime_match;
+	foreach ($exts as $ext) {
+		foreach ($mimes as $ext_preg => $mime_match) {
+			if (preg_match('#'.$ext.'#i', $ext_preg)) {
+				$ext_mimes[$ext] = $mime_match;
 				break;
 			}
 		}
 	}
 
-	$has_audio = $wpdb->get_var( "
+	$has_audio = $wpdb->get_var("
 		SELECT ID
 		FROM $wpdb->posts
 		WHERE post_type = 'attachment'
 		AND post_mime_type LIKE 'audio%'
 		LIMIT 1
-	" );
-	$has_video = $wpdb->get_var( "
+	");
+	$has_video = $wpdb->get_var("
 		SELECT ID
 		FROM $wpdb->posts
 		WHERE post_type = 'attachment'
 		AND post_mime_type LIKE 'video%'
 		LIMIT 1
-	" );
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	");
+	$months = $wpdb->get_results($wpdb->prepare("
 		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 		FROM $wpdb->posts
 		WHERE post_type = %s
 		ORDER BY post_date DESC
-	", 'attachment' ) );
-	foreach ( $months as $month_year ) {
-		$month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
+	", 'attachment'));
+	foreach ($months as $month_year) {
+		$month_year->text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($month_year->month), $month_year->year);
 	}
 
 	$settings = array(
 		'tabs'      => $tabs,
-		'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
-		'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
+		'tabUrl'    => add_query_arg(array('chromeless' => true), admin_url('media-upload.php')),
+		'mimeTypes' => wp_list_pluck(get_post_mime_types(), 0),
 		/** This filter is documented in wp-admin/includes/media.php */
-		'captions'  => ! apply_filters( 'disable_captions', '' ),
+		'captions'  => ! apply_filters('disable_captions', ''),
 		'nonce'     => array(
-			'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
+			'sendToEditor' => wp_create_nonce('media-send-to-editor'),
 		),
 		'post'    => array(
 			'id' => 0,
 		),
 		'defaultProps' => $props,
 		'attachmentCounts' => array(
-			'audio' => ( $has_audio ) ? 1 : 0,
-			'video' => ( $has_video ) ? 1 : 0
+			'audio' => ($has_audio) ? 1 : 0,
+			'video' => ($has_video) ? 1 : 0
 		),
 		'embedExts'    => $exts,
 		'embedMimes'   => $ext_mimes,
@@ -3318,154 +3318,154 @@ 
 	);
 
 	$post = null;
-	if ( isset( $args['post'] ) ) {
-		$post = get_post( $args['post'] );
+	if (isset($args['post'])) {
+		$post = get_post($args['post']);
 		$settings['post'] = array(
 			'id' => $post->ID,
-			'nonce' => wp_create_nonce( 'update-post_' . $post->ID ),
+			'nonce' => wp_create_nonce('update-post_'.$post->ID),
 		);
 
-		$thumbnail_support = current_theme_supports( 'post-thumbnails', $post->post_type ) && post_type_supports( $post->post_type, 'thumbnail' );
-		if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type ) {
-			if ( wp_attachment_is( 'audio', $post ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-			} elseif ( wp_attachment_is( 'video', $post ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+		$thumbnail_support = current_theme_supports('post-thumbnails', $post->post_type) && post_type_supports($post->post_type, 'thumbnail');
+		if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type) {
+			if (wp_attachment_is('audio', $post)) {
+				$thumbnail_support = post_type_supports('attachment:audio', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:audio');
+			} elseif (wp_attachment_is('video', $post)) {
+				$thumbnail_support = post_type_supports('attachment:video', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:video');
 			}
 		}
 
-		if ( $thumbnail_support ) {
-			$featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
+		if ($thumbnail_support) {
+			$featured_image_id = get_post_meta($post->ID, '_thumbnail_id', true);
 			$settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
 		}
 	}
 
-	if ( $post ) {
-		$post_type_object = get_post_type_object( $post->post_type );
+	if ($post) {
+		$post_type_object = get_post_type_object($post->post_type);
 	} else {
-		$post_type_object = get_post_type_object( 'post' );
+		$post_type_object = get_post_type_object('post');
 	}
 
 	$strings = array(
 		// Generic
-		'url'         => __( 'URL' ),
-		'addMedia'    => __( 'Add Media' ),
-		'search'      => __( 'Search' ),
-		'select'      => __( 'Select' ),
-		'cancel'      => __( 'Cancel' ),
-		'update'      => __( 'Update' ),
-		'replace'     => __( 'Replace' ),
-		'remove'      => __( 'Remove' ),
-		'back'        => __( 'Back' ),
+		'url'         => __('URL'),
+		'addMedia'    => __('Add Media'),
+		'search'      => __('Search'),
+		'select'      => __('Select'),
+		'cancel'      => __('Cancel'),
+		'update'      => __('Update'),
+		'replace'     => __('Replace'),
+		'remove'      => __('Remove'),
+		'back'        => __('Back'),
 		/* translators: This is a would-be plural string used in the media manager.
 		   If there is not a word you can use in your language to avoid issues with the
 		   lack of plural support here, turn it into "selected: %d" then translate it.
 		 */
-		'selected'    => __( '%d selected' ),
-		'dragInfo'    => __( 'Drag and drop to reorder media files.' ),
+		'selected'    => __('%d selected'),
+		'dragInfo'    => __('Drag and drop to reorder media files.'),
 
 		// Upload
-		'uploadFilesTitle'  => __( 'Upload Files' ),
-		'uploadImagesTitle' => __( 'Upload Images' ),
+		'uploadFilesTitle'  => __('Upload Files'),
+		'uploadImagesTitle' => __('Upload Images'),
 
 		// Library
-		'mediaLibraryTitle'      => __( 'Media Library' ),
-		'insertMediaTitle'       => __( 'Insert Media' ),
-		'createNewGallery'       => __( 'Create a new gallery' ),
-		'createNewPlaylist'      => __( 'Create a new playlist' ),
-		'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
-		'returnToLibrary'        => __( '&#8592; Return to library' ),
-		'allMediaItems'          => __( 'All media items' ),
-		'allDates'               => __( 'All dates' ),
-		'noItemsFound'           => __( 'No items found.' ),
+		'mediaLibraryTitle'      => __('Media Library'),
+		'insertMediaTitle'       => __('Insert Media'),
+		'createNewGallery'       => __('Create a new gallery'),
+		'createNewPlaylist'      => __('Create a new playlist'),
+		'createNewVideoPlaylist' => __('Create a new video playlist'),
+		'returnToLibrary'        => __('&#8592; Return to library'),
+		'allMediaItems'          => __('All media items'),
+		'allDates'               => __('All dates'),
+		'noItemsFound'           => __('No items found.'),
 		'insertIntoPost'         => $post_type_object->labels->insert_into_item,
-		'unattached'             => __( 'Unattached' ),
-		'trash'                  => _x( 'Trash', 'noun' ),
+		'unattached'             => __('Unattached'),
+		'trash'                  => _x('Trash', 'noun'),
 		'uploadedToThisPost'     => $post_type_object->labels->uploaded_to_this_item,
-		'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkTrash'          => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'bulkSelect'             => __( 'Bulk Select' ),
-		'cancelSelection'        => __( 'Cancel Selection' ),
-		'trashSelected'          => __( 'Trash Selected' ),
-		'untrashSelected'        => __( 'Untrash Selected' ),
-		'deleteSelected'         => __( 'Delete Selected' ),
-		'deletePermanently'      => __( 'Delete Permanently' ),
-		'apply'                  => __( 'Apply' ),
-		'filterByDate'           => __( 'Filter by date' ),
-		'filterByType'           => __( 'Filter by type' ),
-		'searchMediaLabel'       => __( 'Search Media' ),
-		'noMedia'                => __( 'No media files found.' ),
+		'warnDelete'             => __("You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete."),
+		'warnBulkDelete'         => __("You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'warnBulkTrash'          => __("You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'bulkSelect'             => __('Bulk Select'),
+		'cancelSelection'        => __('Cancel Selection'),
+		'trashSelected'          => __('Trash Selected'),
+		'untrashSelected'        => __('Untrash Selected'),
+		'deleteSelected'         => __('Delete Selected'),
+		'deletePermanently'      => __('Delete Permanently'),
+		'apply'                  => __('Apply'),
+		'filterByDate'           => __('Filter by date'),
+		'filterByType'           => __('Filter by type'),
+		'searchMediaLabel'       => __('Search Media'),
+		'noMedia'                => __('No media files found.'),
 
 		// Library Details
-		'attachmentDetails'  => __( 'Attachment Details' ),
+		'attachmentDetails'  => __('Attachment Details'),
 
 		// From URL
-		'insertFromUrlTitle' => __( 'Insert from URL' ),
+		'insertFromUrlTitle' => __('Insert from URL'),
 
 		// Featured Images
 		'setFeaturedImageTitle' => $post_type_object->labels->featured_image,
 		'setFeaturedImage'      => $post_type_object->labels->set_featured_image,
 
 		// Gallery
-		'createGalleryTitle' => __( 'Create Gallery' ),
-		'editGalleryTitle'   => __( 'Edit Gallery' ),
-		'cancelGalleryTitle' => __( '&#8592; Cancel Gallery' ),
-		'insertGallery'      => __( 'Insert gallery' ),
-		'updateGallery'      => __( 'Update gallery' ),
-		'addToGallery'       => __( 'Add to gallery' ),
-		'addToGalleryTitle'  => __( 'Add to Gallery' ),
-		'reverseOrder'       => __( 'Reverse order' ),
+		'createGalleryTitle' => __('Create Gallery'),
+		'editGalleryTitle'   => __('Edit Gallery'),
+		'cancelGalleryTitle' => __('&#8592; Cancel Gallery'),
+		'insertGallery'      => __('Insert gallery'),
+		'updateGallery'      => __('Update gallery'),
+		'addToGallery'       => __('Add to gallery'),
+		'addToGalleryTitle'  => __('Add to Gallery'),
+		'reverseOrder'       => __('Reverse order'),
 
 		// Edit Image
-		'imageDetailsTitle'     => __( 'Image Details' ),
-		'imageReplaceTitle'     => __( 'Replace Image' ),
-		'imageDetailsCancel'    => __( 'Cancel Edit' ),
-		'editImage'             => __( 'Edit Image' ),
+		'imageDetailsTitle'     => __('Image Details'),
+		'imageReplaceTitle'     => __('Replace Image'),
+		'imageDetailsCancel'    => __('Cancel Edit'),
+		'editImage'             => __('Edit Image'),
 
 		// Crop Image
-		'chooseImage' => __( 'Choose Image' ),
-		'selectAndCrop' => __( 'Select and Crop' ),
-		'skipCropping' => __( 'Skip Cropping' ),
-		'cropImage' => __( 'Crop Image' ),
-		'cropYourImage' => __( 'Crop your image' ),
-		'cropping' => __( 'Cropping&hellip;' ),
-		'suggestedDimensions' => __( 'Suggested image dimensions:' ),
-		'cropError' => __( 'There has been an error cropping your image.' ),
+		'chooseImage' => __('Choose Image'),
+		'selectAndCrop' => __('Select and Crop'),
+		'skipCropping' => __('Skip Cropping'),
+		'cropImage' => __('Crop Image'),
+		'cropYourImage' => __('Crop your image'),
+		'cropping' => __('Cropping&hellip;'),
+		'suggestedDimensions' => __('Suggested image dimensions:'),
+		'cropError' => __('There has been an error cropping your image.'),
 
 		// Edit Audio
-		'audioDetailsTitle'     => __( 'Audio Details' ),
-		'audioReplaceTitle'     => __( 'Replace Audio' ),
-		'audioAddSourceTitle'   => __( 'Add Audio Source' ),
-		'audioDetailsCancel'    => __( 'Cancel Edit' ),
+		'audioDetailsTitle'     => __('Audio Details'),
+		'audioReplaceTitle'     => __('Replace Audio'),
+		'audioAddSourceTitle'   => __('Add Audio Source'),
+		'audioDetailsCancel'    => __('Cancel Edit'),
 
 		// Edit Video
-		'videoDetailsTitle'     => __( 'Video Details' ),
-		'videoReplaceTitle'     => __( 'Replace Video' ),
-		'videoAddSourceTitle'   => __( 'Add Video Source' ),
-		'videoDetailsCancel'    => __( 'Cancel Edit' ),
-		'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),
-		'videoAddTrackTitle'	=> __( 'Add Subtitles' ),
+		'videoDetailsTitle'     => __('Video Details'),
+		'videoReplaceTitle'     => __('Replace Video'),
+		'videoAddSourceTitle'   => __('Add Video Source'),
+		'videoDetailsCancel'    => __('Cancel Edit'),
+		'videoSelectPosterImageTitle' => __('Select Poster Image'),
+		'videoAddTrackTitle'	=> __('Add Subtitles'),
 
  		// Playlist
- 		'playlistDragInfo'    => __( 'Drag and drop to reorder tracks.' ),
- 		'createPlaylistTitle' => __( 'Create Audio Playlist' ),
- 		'editPlaylistTitle'   => __( 'Edit Audio Playlist' ),
- 		'cancelPlaylistTitle' => __( '&#8592; Cancel Audio Playlist' ),
- 		'insertPlaylist'      => __( 'Insert audio playlist' ),
- 		'updatePlaylist'      => __( 'Update audio playlist' ),
- 		'addToPlaylist'       => __( 'Add to audio playlist' ),
- 		'addToPlaylistTitle'  => __( 'Add to Audio Playlist' ),
+ 		'playlistDragInfo'    => __('Drag and drop to reorder tracks.'),
+ 		'createPlaylistTitle' => __('Create Audio Playlist'),
+ 		'editPlaylistTitle'   => __('Edit Audio Playlist'),
+ 		'cancelPlaylistTitle' => __('&#8592; Cancel Audio Playlist'),
+ 		'insertPlaylist'      => __('Insert audio playlist'),
+ 		'updatePlaylist'      => __('Update audio playlist'),
+ 		'addToPlaylist'       => __('Add to audio playlist'),
+ 		'addToPlaylistTitle'  => __('Add to Audio Playlist'),
 
  		// Video Playlist
- 		'videoPlaylistDragInfo'    => __( 'Drag and drop to reorder videos.' ),
- 		'createVideoPlaylistTitle' => __( 'Create Video Playlist' ),
- 		'editVideoPlaylistTitle'   => __( 'Edit Video Playlist' ),
- 		'cancelVideoPlaylistTitle' => __( '&#8592; Cancel Video Playlist' ),
- 		'insertVideoPlaylist'      => __( 'Insert video playlist' ),
- 		'updateVideoPlaylist'      => __( 'Update video playlist' ),
- 		'addToVideoPlaylist'       => __( 'Add to video playlist' ),
- 		'addToVideoPlaylistTitle'  => __( 'Add to Video Playlist' ),
+ 		'videoPlaylistDragInfo'    => __('Drag and drop to reorder videos.'),
+ 		'createVideoPlaylistTitle' => __('Create Video Playlist'),
+ 		'editVideoPlaylistTitle'   => __('Edit Video Playlist'),
+ 		'cancelVideoPlaylistTitle' => __('&#8592; Cancel Video Playlist'),
+ 		'insertVideoPlaylist'      => __('Insert video playlist'),
+ 		'updateVideoPlaylist'      => __('Update video playlist'),
+ 		'addToVideoPlaylist'       => __('Add to video playlist'),
+ 		'addToVideoPlaylistTitle'  => __('Add to Video Playlist'),
 	);
 
 	/**
@@ -3476,7 +3476,7 @@ 
 	 * @param array   $settings List of media view settings.
 	 * @param WP_Post $post     Post object.
 	 */
-	$settings = apply_filters( 'media_view_settings', $settings, $post );
+	$settings = apply_filters('media_view_settings', $settings, $post);
 
 	/**
 	 * Filters the media view strings.
@@ -3486,35 +3486,35 @@ 
 	 * @param array   $strings List of media view strings.
 	 * @param WP_Post $post    Post object.
 	 */
-	$strings = apply_filters( 'media_view_strings', $strings,  $post );
+	$strings = apply_filters('media_view_strings', $strings, $post);
 
 	$strings['settings'] = $settings;
 
 	// Ensure we enqueue media-editor first, that way media-views is
 	// registered internally before we try to localize it. see #24724.
-	wp_enqueue_script( 'media-editor' );
-	wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
+	wp_enqueue_script('media-editor');
+	wp_localize_script('media-views', '_wpMediaViewsL10n', $strings);
 
-	wp_enqueue_script( 'media-audiovideo' );
-	wp_enqueue_style( 'media-views' );
-	if ( is_admin() ) {
-		wp_enqueue_script( 'mce-view' );
-		wp_enqueue_script( 'image-edit' );
+	wp_enqueue_script('media-audiovideo');
+	wp_enqueue_style('media-views');
+	if (is_admin()) {
+		wp_enqueue_script('mce-view');
+		wp_enqueue_script('image-edit');
 	}
-	wp_enqueue_style( 'imgareaselect' );
+	wp_enqueue_style('imgareaselect');
 	wp_plupload_default_settings();
 
-	require_once ABSPATH . WPINC . '/media-template.php';
-	add_action( 'admin_footer', 'wp_print_media_templates' );
-	add_action( 'wp_footer', 'wp_print_media_templates' );
-	add_action( 'customize_controls_print_footer_scripts', 'wp_print_media_templates' );
+	require_once ABSPATH.WPINC.'/media-template.php';
+	add_action('admin_footer', 'wp_print_media_templates');
+	add_action('wp_footer', 'wp_print_media_templates');
+	add_action('customize_controls_print_footer_scripts', 'wp_print_media_templates');
 
 	/**
 	 * Fires at the conclusion of wp_enqueue_media().
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'wp_enqueue_media' );
+	do_action('wp_enqueue_media');
 }
 
 /**
@@ -3526,8 +3526,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array Found attachments.
  */
-function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
+function get_attached_media($type, $post = 0) {
+	if ( ! $post = get_post($post))
 		return array();
 
 	$args = array(
@@ -3548,9 +3548,9 @@ 
 	 * @param string $type Mime type of the desired media.
 	 * @param mixed  $post Post ID or object.
 	 */
-	$args = apply_filters( 'get_attached_media_args', $args, $type, $post );
+	$args = apply_filters('get_attached_media_args', $args, $type, $post);
 
-	$children = get_children( $args );
+	$children = get_children($args);
 
 	/**
 	 * Filters the list of media attached to the given post.
@@ -3561,7 +3561,7 @@ 
 	 * @param string $type     Mime type of the media desired.
 	 * @param mixed  $post     Post ID or object.
 	 */
-	return (array) apply_filters( 'get_attached_media', $children, $type, $post );
+	return (array) apply_filters('get_attached_media', $children, $type, $post);
 }
 
 /**
@@ -3573,7 +3573,7 @@ 
  * @param array  $types   An array of media types: 'audio', 'video', 'object', 'embed', or 'iframe'.
  * @return array A list of found HTML media embeds.
  */
-function get_media_embedded_in_content( $content, $types = null ) {
+function get_media_embedded_in_content($content, $types = null) {
 	$html = array();
 
 	/**
@@ -3584,20 +3584,20 @@ 
 	 * @param array $allowed_media_types An array of allowed media types. Default media types are
 	 *                                   'audio', 'video', 'object', 'embed', and 'iframe'.
 	 */
-	$allowed_media_types = apply_filters( 'media_embedded_in_content_allowed_types', array( 'audio', 'video', 'object', 'embed', 'iframe' ) );
+	$allowed_media_types = apply_filters('media_embedded_in_content_allowed_types', array('audio', 'video', 'object', 'embed', 'iframe'));
 
-	if ( ! empty( $types ) ) {
-		if ( ! is_array( $types ) ) {
-			$types = array( $types );
+	if ( ! empty($types)) {
+		if ( ! is_array($types)) {
+			$types = array($types);
 		}
 
-		$allowed_media_types = array_intersect( $allowed_media_types, $types );
+		$allowed_media_types = array_intersect($allowed_media_types, $types);
 	}
 
-	$tags = implode( '|', $allowed_media_types );
+	$tags = implode('|', $allowed_media_types);
 
-	if ( preg_match_all( '#<(?P<tag>' . $tags . ')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches ) ) {
-		foreach ( $matches[0] as $match ) {
+	if (preg_match_all('#<(?P<tag>'.$tags.')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches)) {
+		foreach ($matches[0] as $match) {
 			$html[] = $match;
 		}
 	}
@@ -3615,31 +3615,31 @@ 
  * @return array A list of arrays, each containing gallery data and srcs parsed
  *               from the expanded shortcode.
  */
-function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_galleries($post, $html = true) {
+	if ( ! $post = get_post($post))
 		return array();
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
+	if ( ! has_shortcode($post->post_content, 'gallery'))
 		return array();
 
 	$galleries = array();
-	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
-		foreach ( $matches as $shortcode ) {
-			if ( 'gallery' === $shortcode[2] ) {
+	if (preg_match_all('/'.get_shortcode_regex().'/s', $post->post_content, $matches, PREG_SET_ORDER)) {
+		foreach ($matches as $shortcode) {
+			if ('gallery' === $shortcode[2]) {
 				$srcs = array();
 
-				$gallery = do_shortcode_tag( $shortcode );
-				if ( $html ) {
+				$gallery = do_shortcode_tag($shortcode);
+				if ($html) {
 					$galleries[] = $gallery;
 				} else {
-					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
-					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
+					preg_match_all('#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER);
+					if ( ! empty($src)) {
+						foreach ($src as $s)
 							$srcs[] = $s[2];
 					}
 
-					$data = shortcode_parse_atts( $shortcode[3] );
-					$data['src'] = array_values( array_unique( $srcs ) );
+					$data = shortcode_parse_atts($shortcode[3]);
+					$data['src'] = array_values(array_unique($srcs));
 					$galleries[] = $data;
 				}
 			}
@@ -3654,7 +3654,7 @@ 
 	 * @param array   $galleries Associative array of all found post galleries.
 	 * @param WP_Post $post      Post object.
 	 */
-	return apply_filters( 'get_post_galleries', $galleries, $post );
+	return apply_filters('get_post_galleries', $galleries, $post);
 }
 
 /**
@@ -3666,9 +3666,9 @@ 
  * @param bool        $html Optional. Whether to return HTML or data. Default is true.
  * @return string|array Gallery data and srcs parsed from the expanded shortcode.
  */
-function get_post_gallery( $post = 0, $html = true ) {
-	$galleries = get_post_galleries( $post, $html );
-	$gallery = reset( $galleries );
+function get_post_gallery($post = 0, $html = true) {
+	$galleries = get_post_galleries($post, $html);
+	$gallery = reset($galleries);
 
 	/**
 	 * Filters the first-found post gallery.
@@ -3679,7 +3679,7 @@ 
 	 * @param int|WP_Post $post      Post ID or object.
 	 * @param array       $galleries Associative array of all found post galleries.
 	 */
-	return apply_filters( 'get_post_gallery', $gallery, $post, $galleries );
+	return apply_filters('get_post_gallery', $gallery, $post, $galleries);
 }
 
 /**
@@ -3693,9 +3693,9 @@ 
  * @return array A list of lists, each containing image srcs parsed.
  *               from an expanded shortcode
  */
-function get_post_galleries_images( $post = 0 ) {
-	$galleries = get_post_galleries( $post, false );
-	return wp_list_pluck( $galleries, 'src' );
+function get_post_galleries_images($post = 0) {
+	$galleries = get_post_galleries($post, false);
+	return wp_list_pluck($galleries, 'src');
 }
 
 /**
@@ -3708,9 +3708,9 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of a gallery's image srcs in order.
  */
-function get_post_gallery_images( $post = 0 ) {
-	$gallery = get_post_gallery( $post, false );
-	return empty( $gallery['src'] ) ? array() : $gallery['src'];
+function get_post_gallery_images($post = 0) {
+	$gallery = get_post_gallery($post, false);
+	return empty($gallery['src']) ? array() : $gallery['src'];
 }
 
 /**
@@ -3720,20 +3720,20 @@ 
  *
  * @param WP_Post $attachment Attachment object.
  */
-function wp_maybe_generate_attachment_metadata( $attachment ) {
-	if ( empty( $attachment ) || ( empty( $attachment->ID ) || ! $attachment_id = (int) $attachment->ID ) ) {
+function wp_maybe_generate_attachment_metadata($attachment) {
+	if (empty($attachment) || (empty($attachment->ID) || ! $attachment_id = (int) $attachment->ID)) {
 		return;
 	}
 
-	$file = get_attached_file( $attachment_id );
-	$meta = wp_get_attachment_metadata( $attachment_id );
-	if ( empty( $meta ) && file_exists( $file ) ) {
-		$_meta = get_post_meta( $attachment_id );
-		$regeneration_lock = 'wp_generating_att_' . $attachment_id;
-		if ( ! array_key_exists( '_wp_attachment_metadata', $_meta ) && ! get_transient( $regeneration_lock ) ) {
-			set_transient( $regeneration_lock, $file );
-			wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
-			delete_transient( $regeneration_lock );
+	$file = get_attached_file($attachment_id);
+	$meta = wp_get_attachment_metadata($attachment_id);
+	if (empty($meta) && file_exists($file)) {
+		$_meta = get_post_meta($attachment_id);
+		$regeneration_lock = 'wp_generating_att_'.$attachment_id;
+		if ( ! array_key_exists('_wp_attachment_metadata', $_meta) && ! get_transient($regeneration_lock)) {
+			set_transient($regeneration_lock, $file);
+			wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
+			delete_transient($regeneration_lock);
 		}
 	}
 }
@@ -3748,29 +3748,29 @@ 
  * @param string $url The URL to resolve.
  * @return int The found post ID, or 0 on failure.
  */
-function attachment_url_to_postid( $url ) {
+function attachment_url_to_postid($url) {
 	global $wpdb;
 
 	$dir = wp_get_upload_dir();
 	$path = $url;
 
-	$site_url = parse_url( $dir['url'] );
-	$image_path = parse_url( $path );
+	$site_url = parse_url($dir['url']);
+	$image_path = parse_url($path);
 
 	//force the protocols to match if needed
-	if ( isset( $image_path['scheme'] ) && ( $image_path['scheme'] !== $site_url['scheme'] ) ) {
-		$path = str_replace( $image_path['scheme'], $site_url['scheme'], $path );
+	if (isset($image_path['scheme']) && ($image_path['scheme'] !== $site_url['scheme'])) {
+		$path = str_replace($image_path['scheme'], $site_url['scheme'], $path);
 	}
 
-	if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
-		$path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
+	if (0 === strpos($path, $dir['baseurl'].'/')) {
+		$path = substr($path, strlen($dir['baseurl'].'/'));
 	}
 
 	$sql = $wpdb->prepare(
 		"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
 		$path
 	);
-	$post_id = $wpdb->get_var( $sql );
+	$post_id = $wpdb->get_var($sql);
 
 	/**
 	 * Filters an attachment id found by URL.
@@ -3780,7 +3780,7 @@ 
 	 * @param int|null $post_id The post_id (if any) found by the function.
 	 * @param string   $url     The URL being looked up.
 	 */
-	return (int) apply_filters( 'attachment_url_to_postid', $post_id, $url );
+	return (int) apply_filters('attachment_url_to_postid', $post_id, $url);
 }
 
 /**
@@ -3793,9 +3793,9 @@ 
  * @return array The relevant CSS file URLs.
  */
 function wpview_media_sandbox_styles() {
- 	$version = 'ver=' . $GLOBALS['wp_version'];
- 	$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
- 	$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
+ 	$version = 'ver='.$GLOBALS['wp_version'];
+ 	$mediaelement = includes_url("js/mediaelement/mediaelementplayer.min.css?$version");
+ 	$wpmediaelement = includes_url("js/mediaelement/wp-mediaelement.css?$version");
 
-	return array( $mediaelement, $wpmediaelement );
+	return array($mediaelement, $wpmediaelement);
 }

Braces +137 added lines, -97 removed lines

@@ -41,14 +41,14 @@ 
 function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	if ( ! $context )
-		$context = is_admin() ? 'edit' : 'display';
+	if ( ! $context ) {
+			$context = is_admin() ? 'edit' : 'display';
+	}
 
 	if ( is_array($size) ) {
 		$max_width = $size[0];
 		$max_height = $size[1];
-	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
@@ -56,21 +56,18 @@ 
 			$max_width = 128;
 			$max_height = 96;
 		}
-	}
-	elseif ( $size == 'medium' ) {
+	} elseif ( $size == 'medium' ) {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 
-	}
-	elseif ( $size == 'medium_large' ) {
+	} elseif ( $size == 'medium_large' ) {
 		$max_width = intval( get_option( 'medium_large_size_w' ) );
 		$max_height = intval( get_option( 'medium_large_size_h' ) );
 
 		if ( intval( $content_width ) > 0 ) {
 			$max_width = min( intval( $content_width ), $max_width );
 		}
-	}
-	elseif ( $size == 'large' ) {
+	} elseif ( $size == 'large' ) {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -85,8 +82,10 @@ 
 	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
 		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
 		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
+		if ( intval($content_width) > 0 && 'edit' == $context ) {
+			// Only in admin. Assume that theme authors know what they're doing.
 			$max_width = min( intval($content_width), $max_width );
+		}
 	}
 	// $size == 'full' has no constraint
 	else {
@@ -130,10 +129,12 @@ 
  */
 function image_hwstring( $width, $height ) {
 	$out = '';
-	if ($width)
-		$out .= 'width="'.intval($width).'" ';
-	if ($height)
-		$out .= 'height="'.intval($height).'" ';
+	if ($width) {
+			$out .= 'width="'.intval($width).'" ';
+	}
+	if ($height) {
+			$out .= 'height="'.intval($height).'" ';
+	}
 	return $out;
 }
 
@@ -164,8 +165,9 @@ 
  */
 function image_downsize( $id, $size = 'medium' ) {
 
-	if ( !wp_attachment_is_image($id) )
-		return false;
+	if ( !wp_attachment_is_image($id) ) {
+			return false;
+	}
 
 	/**
 	 * Filters whether to preempt the output of image_downsize().
@@ -196,8 +198,7 @@ 
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
-	}
-	elseif ( $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumbnail' ) {
 		// fall back to the old thumbnail
 		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
@@ -384,8 +385,9 @@ 
  * @return array First item is the width, the second item is the height.
  */
 function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+	if ( !$max_width && !$max_height ) {
+			return array( $current_width, $current_height );
+	}
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
@@ -470,11 +472,13 @@ 
  */
 function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
 
-	if ($orig_w <= 0 || $orig_h <= 0)
-		return false;
+	if ($orig_w <= 0 || $orig_h <= 0) {
+			return false;
+	}
 	// at least one of dest_w or dest_h must be specific
-	if ($dest_w <= 0 && $dest_h <= 0)
-		return false;
+	if ($dest_w <= 0 && $dest_h <= 0) {
+			return false;
+	}
 
 	/**
 	 * Filters whether to preempt calculating the image resize dimensions.
@@ -493,8 +497,9 @@ 
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
 	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
-		return $output;
+	if ( null !== $output ) {
+			return $output;
+	}
 
 	if ( $crop ) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
@@ -578,8 +583,9 @@ 
 	if ( $width || $height ) {
 		$editor = wp_get_image_editor( $file );
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
-			return false;
+		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) ) {
+					return false;
+		}
 
 		$resized_file = $editor->save();
 
@@ -755,8 +761,9 @@ 
 function get_intermediate_image_sizes() {
 	global $_wp_additional_image_sizes;
 	$image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) ) {
+			$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	}
 
 	/**
 	 * Filters the list of intermediate image sizes.
@@ -852,10 +859,14 @@ 
 			'class'	=> "attachment-$size_class size-$size_class",
 			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		if ( empty($default_attr['alt']) ) {
+					$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt ));
+		}
+		// If not, Use the Caption
+		if ( empty($default_attr['alt']) ) {
+					$default_attr['alt'] = trim(strip_tags( $attachment->post_title ));
+		}
+		// Finally, use the title
 
 		$attr = wp_parse_args( $attr, $default_attr );
 
@@ -1507,8 +1518,9 @@ 
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
 	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
-		return $output;
+	if ( $output != '' ) {
+			return $output;
+	}
 
 	$atts = shortcode_atts( array(
 		'id'	  => '',
@@ -1519,11 +1531,13 @@ 
 	), $attr, 'caption' );
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
-		return $content;
+	if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
+			return $content;
+	}
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty( $atts['id'] ) ) {
+			$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	}
 
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
@@ -1549,8 +1563,9 @@ 
 	$caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content );
 
 	$style = '';
-	if ( $caption_width )
-		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	if ( $caption_width ) {
+			$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	}
 
 	$html = '';
 	if ( $html5 ) {
@@ -2704,28 +2719,32 @@ 
 	} elseif ( is_array( $attachment ) ) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
-		return array();
+	if ( ! is_object($attachment) ) {
+			return array();
+	}
 
 	$file = get_attached_file( $attachment->ID );
 	$filename = basename( $file );
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	if ( false !== strpos($filename, '.') ) {
+			$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	}
 	if ( !empty($attachment->post_mime_type) ) {
 		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
+		if ( false !== strpos($attachment->post_mime_type, '/') ) {
+					foreach ( explode('/', $attachment->post_mime_type) as $token )
 				if ( !empty($token) )
 					$objects[] = "attachment:$token";
+		}
 	}
 
 	$taxonomies = array();
-	foreach ( $objects as $object )
-		if ( $taxes = get_object_taxonomies($object) )
+	foreach ( $objects as $object ) {
+			if ( $taxes = get_object_taxonomies($object) )
 			$taxonomies = array_merge($taxonomies, $taxes);
+	}
 
 	return array_unique($taxonomies);
 }
@@ -2748,10 +2767,11 @@ 
 	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 		foreach ( $taxonomy->object_type as $object_type ) {
 			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
-					$taxonomies[] = $taxonomy->name;
-				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+				if ( 'names' == $output ) {
+									$taxonomies[] = $taxonomy->name;
+				} else {
+									$taxonomies[ $taxonomy->name ] = $taxonomy;
+				}
 				break;
 			}
 		}
@@ -2844,8 +2864,9 @@ 
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
-			$args['mime_type'] = $file_info['type'];
+		if ( isset( $file_info ) && $file_info['type'] ) {
+					$args['mime_type'] = $file_info['type'];
+		}
 	}
 
 	$implementation = _wp_image_editor_choose( $args );
@@ -2854,8 +2875,9 @@ 
 		$editor = new $implementation( $path );
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
-			return $loaded;
+		if ( is_wp_error( $loaded ) ) {
+					return $loaded;
+		}
 
 		return $editor;
 	}
@@ -2902,8 +2924,9 @@ 
 	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
 
 	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
-			continue;
+		if ( ! call_user_func( array( $implementation, 'test' ), $args ) ) {
+					continue;
+		}
 
 		if ( isset( $args['mime_type'] ) &&
 			! call_user_func(
@@ -2932,8 +2955,9 @@ 
 	$wp_scripts = wp_scripts();
 
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
-		return;
+	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
+			return;
+	}
 
 	$max_upload_size = wp_max_upload_size();
 	$allowed_extensions = array_keys( get_allowed_mime_types() );
@@ -2997,8 +3021,9 @@ 
 
 	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
 
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
 }
@@ -3013,17 +3038,20 @@ 
  * @return array|void Array of attachment details.
  */
 function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
-		return;
+	if ( ! $attachment = get_post( $attachment ) ) {
+			return;
+	}
 
-	if ( 'attachment' != $attachment->post_type )
-		return;
+	if ( 'attachment' != $attachment->post_type ) {
+			return;
+	}
 
 	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
-	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	} else {
+			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	}
 
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
 
@@ -3099,8 +3127,9 @@ 
 		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if ( current_user_can( 'delete_post', $attachment->ID ) ) {
+			$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	}
 
 	if ( $meta && 'image' === $type ) {
 		$sizes = array();
@@ -3122,8 +3151,9 @@ 
 
 			/** This filter is documented in wp-includes/media.php */
 			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
-					continue;
+				if ( ! $downsize[3] ) {
+									continue;
+				}
 				$sizes[ $size ] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
@@ -3131,8 +3161,9 @@ 
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
 			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				if ( ! isset( $base_url ) ) {
+									$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				}
 
 				// Nothing from the filter, so consult image metadata if we have it.
 				$size_meta = $meta['sizes'][ $size ];
@@ -3160,15 +3191,18 @@ 
 
 		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
 	} elseif ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
-			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
-			$response['height'] = (int) $meta['height'];
+		if ( isset( $meta['width'] ) ) {
+					$response['width'] = (int) $meta['width'];
+		}
+		if ( isset( $meta['height'] ) ) {
+					$response['height'] = (int) $meta['height'];
+		}
 	}
 
 	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
-			$response['fileLength'] = $meta['length_formatted'];
+		if ( isset( $meta['length_formatted'] ) ) {
+					$response['fileLength'] = $meta['length_formatted'];
+		}
 
 		$response['meta'] = array();
 		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
@@ -3194,8 +3228,9 @@ 
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if ( function_exists('get_compat_media_markup') ) {
+			$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	}
 
 	/**
 	 * Filters the attachment data prepared for JavaScript.
@@ -3227,8 +3262,9 @@ 
  */
 function wp_enqueue_media( $args = array() ) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
-		return;
+	if ( did_action( 'wp_enqueue_media' ) ) {
+			return;
+	}
 
 	global $content_width, $wpdb, $wp_locale;
 
@@ -3527,8 +3563,9 @@ 
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
 	$args = array(
 		'post_parent' => $post->ID,
@@ -3616,11 +3653,13 @@ 
  *               from the expanded shortcode.
  */
 function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
-		return array();
+	if ( ! has_shortcode( $post->post_content, 'gallery' ) ) {
+			return array();
+	}
 
 	$galleries = array();
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
@@ -3634,8 +3673,9 @@ 
 				} else {
 					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
 					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
-							$srcs[] = $s[2];
+						foreach ( $src as $s ) {
+													$srcs[] = $s[2];
+						}
 					}
 
 					$data = shortcode_parse_atts( $shortcode[3] );

src/wp-includes/class-requests.php

Spacing +23 added lines, -23 removed lines

@@ -142,8 +142,8 @@ 
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-			require_once(dirname(__FILE__) . '/' . $file . '.php');
+		if (file_exists(dirname(__FILE__).'/'.$file.'.php')) {
+			require_once(dirname(__FILE__).'/'.$file.'.php');
 		}
 	}
 
@@ -200,7 +200,7 @@ 
 
 		// Find us a working transport
 		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
+			if ( ! class_exists($class)) {
 				continue;
 			}
 
@@ -364,7 +364,7 @@ 
 
 		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
 
-		if (!empty($options['transport'])) {
+		if ( ! empty($options['transport'])) {
 			$transport = $options['transport'];
 
 			if (is_string($options['transport'])) {
@@ -427,24 +427,24 @@ 
 	public static function request_multiple($requests, $options = array()) {
 		$options = array_merge(self::get_default_options(true), $options);
 
-		if (!empty($options['hooks'])) {
+		if ( ! empty($options['hooks'])) {
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
+			if ( ! empty($options['complete'])) {
 				$options['hooks']->register('multiple.request.complete', $options['complete']);
 			}
 		}
 
 		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
+			if ( ! isset($request['headers'])) {
 				$request['headers'] = array();
 			}
-			if (!isset($request['data'])) {
+			if ( ! isset($request['data'])) {
 				$request['data'] = array();
 			}
-			if (!isset($request['type'])) {
+			if ( ! isset($request['type'])) {
 				$request['type'] = self::GET;
 			}
-			if (!isset($request['options'])) {
+			if ( ! isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
 			}
@@ -460,14 +460,14 @@ 
 			// Ensure we only hook in once
 			if ($request['options']['hooks'] !== $options['hooks']) {
 				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
+				if ( ! empty($request['options']['complete'])) {
 					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
 				}
 			}
 		}
 		unset($request);
 
-		if (!empty($options['transport'])) {
+		if ( ! empty($options['transport'])) {
 			$transport = $options['transport'];
 
 			if (is_string($options['transport'])) {
@@ -503,7 +503,7 @@ 
 		$defaults = array(
 			'timeout' => 10,
 			'connect_timeout' => 10,
-			'useragent' => 'php-requests/' . self::VERSION,
+			'useragent' => 'php-requests/'.self::VERSION,
 			'protocol_version' => 1.1,
 			'redirected' => 0,
 			'redirects' => 10,
@@ -533,11 +533,11 @@ 
 	 * @return string Default certificate path.
 	 */
 	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
+		if ( ! empty(Requests::$certificate_path)) {
 			return Requests::$certificate_path;
 		}
 
-		return dirname(__FILE__) . '/Requests/Transport/cacert.pem';
+		return dirname(__FILE__).'/Requests/Transport/cacert.pem';
 	}
 
 	/**
@@ -545,7 +545,7 @@ 
 	 *
 	 * @param string $path Certificate path, pointing to a PEM file.
 	 */
-	public static function set_certificate_path( $path ) {
+	public static function set_certificate_path($path) {
 		Requests::$certificate_path = $path;
 	}
 
@@ -560,7 +560,7 @@ 
 	 * @return array $options
 	 */
 	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+		if ( ! preg_match('/^http(s)?:\/\//i', $url, $matches)) {
 			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
 		}
 
@@ -601,7 +601,7 @@ 
 		// Massage the type to ensure we support it.
 		$type = strtoupper($type);
 
-		if (!isset($options['data_format'])) {
+		if ( ! isset($options['data_format'])) {
 			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
 			}
@@ -627,14 +627,14 @@ 
 	 */
 	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
 		$return = new Requests_Response();
-		if (!$options['blocking']) {
+		if ( ! $options['blocking']) {
 			return $return;
 		}
 
 		$return->raw = $headers;
 		$return->url = $url;
 
-		if (!$options['filename']) {
+		if ( ! $options['filename']) {
 			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
@@ -749,7 +749,7 @@ 
 	 * @return string Decoded body
 	 */
 	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($data))) {
+		if ( ! preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($data))) {
 			return $data;
 		}
 
@@ -758,7 +758,7 @@ 
 
 		while (true) {
 			$is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
+			if ( ! $is_chunked) {
 				// Looks like it's not chunked after all
 				return $data;
 			}
@@ -927,7 +927,7 @@ 
 			// between a compressed document, and a ZIP file
 			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
 
-			if (!$zip_compressed_on_the_fly) {
+			if ( ! $zip_compressed_on_the_fly) {
 				// Don't attempt to decode a compressed zip file
 				return $gzData;
 			}

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

Spacing +156 added lines, -156 removed lines

@@ -122,11 +122,11 @@ 
 	 *                                      theme mod or option name.
 	 * @param array                $args    Setting arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
@@ -134,32 +134,32 @@ 
 		$this->id = $id;
 
 		// Parse the ID for array keys.
-		$this->id_data['keys'] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
-		$this->id_data['base'] = array_shift( $this->id_data['keys'] );
+		$this->id_data['keys'] = preg_split('/\[/', str_replace(']', '', $this->id));
+		$this->id_data['base'] = array_shift($this->id_data['keys']);
 
 		// Rebuild the ID.
-		$this->id = $this->id_data[ 'base' ];
-		if ( ! empty( $this->id_data[ 'keys' ] ) ) {
-			$this->id .= '[' . implode( '][', $this->id_data['keys'] ) . ']';
+		$this->id = $this->id_data['base'];
+		if ( ! empty($this->id_data['keys'])) {
+			$this->id .= '['.implode('][', $this->id_data['keys']).']';
 		}
 
-		if ( $this->validate_callback ) {
-			add_filter( "customize_validate_{$this->id}", $this->validate_callback, 10, 3 );
+		if ($this->validate_callback) {
+			add_filter("customize_validate_{$this->id}", $this->validate_callback, 10, 3);
 		}
-		if ( $this->sanitize_callback ) {
-			add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+		if ($this->sanitize_callback) {
+			add_filter("customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2);
 		}
-		if ( $this->sanitize_js_callback ) {
-			add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		if ($this->sanitize_js_callback) {
+			add_filter("customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2);
 		}
 
-		if ( 'option' === $this->type || 'theme_mod' === $this->type ) {
+		if ('option' === $this->type || 'theme_mod' === $this->type) {
 			// Other setting types can opt-in to aggregate multidimensional explicitly.
 			$this->aggregate_multidimensional();
 
 			// Allow option settings to indicate whether they should be autoloaded.
-			if ( 'option' === $this->type && isset( $args['autoload'] ) ) {
-				self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] = $args['autoload'];
+			if ('option' === $this->type && isset($args['autoload'])) {
+				self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'] = $args['autoload'];
 			}
 		}
 	}
@@ -192,20 +192,20 @@ 
 	 */
 	protected function aggregate_multidimensional() {
 		$id_base = $this->id_data['base'];
-		if ( ! isset( self::$aggregated_multidimensionals[ $this->type ] ) ) {
-			self::$aggregated_multidimensionals[ $this->type ] = array();
+		if ( ! isset(self::$aggregated_multidimensionals[$this->type])) {
+			self::$aggregated_multidimensionals[$this->type] = array();
 		}
-		if ( ! isset( self::$aggregated_multidimensionals[ $this->type ][ $id_base ] ) ) {
-			self::$aggregated_multidimensionals[ $this->type ][ $id_base ] = array(
+		if ( ! isset(self::$aggregated_multidimensionals[$this->type][$id_base])) {
+			self::$aggregated_multidimensionals[$this->type][$id_base] = array(
 				'previewed_instances'       => array(), // Calling preview() will add the $setting to the array.
 				'preview_applied_instances' => array(), // Flags for which settings have had their values applied.
-				'root_value'                => $this->get_root_value( array() ), // Root value for initial state, manipulated by preview and update calls.
+				'root_value'                => $this->get_root_value(array()), // Root value for initial state, manipulated by preview and update calls.
 			);
 		}
 
-		if ( ! empty( $this->id_data['keys'] ) ) {
+		if ( ! empty($this->id_data['keys'])) {
 			// Note the preview-applied flag is cleared at priority 9 to ensure it is cleared before a deferred-preview runs.
-			add_action( "customize_post_value_set_{$this->id}", array( $this, '_clear_aggregated_multidimensional_preview_applied_flag' ), 9 );
+			add_action("customize_post_value_set_{$this->id}", array($this, '_clear_aggregated_multidimensional_preview_applied_flag'), 9);
 			$this->is_multidimensional_aggregated = true;
 		}
 	}
@@ -241,10 +241,10 @@ 
 	 * @return bool If preview() has been called.
 	 */
 	public function is_current_blog_previewed() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			return false;
 		}
-		return ( get_current_blog_id() === $this->_previewed_blog_id );
+		return (get_current_blog_id() === $this->_previewed_blog_id);
 	}
 
 	/**
@@ -270,18 +270,18 @@ 
 	 * @return bool False when preview short-circuits due no change needing to be previewed.
 	 */
 	public function preview() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			$this->_previewed_blog_id = get_current_blog_id();
 		}
 
 		// Prevent re-previewing an already-previewed setting.
-		if ( $this->is_previewed ) {
+		if ($this->is_previewed) {
 			return true;
 		}
 
 		$id_base = $this->id_data['base'];
-		$is_multidimensional = ! empty( $this->id_data['keys'] );
-		$multidimensional_filter = array( $this, '_multidimensional_preview_filter' );
+		$is_multidimensional = ! empty($this->id_data['keys']);
+		$multidimensional_filter = array($this, '_multidimensional_preview_filter');
 
 		/*
 		 * Check if the setting has a pre-existing value (an isset check),
@@ -290,53 +290,53 @@ 
 		 * to be previewed.
 		 */
 		$undefined = new stdClass();
-		$needs_preview = ( $undefined !== $this->post_value( $undefined ) );
+		$needs_preview = ($undefined !== $this->post_value($undefined));
 		$value = null;
 
 		// Since no post value was defined, check if we have an initial value set.
-		if ( ! $needs_preview ) {
-			if ( $this->is_multidimensional_aggregated ) {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-				$value = $this->multidimensional_get( $root, $this->id_data['keys'], $undefined );
+		if ( ! $needs_preview) {
+			if ($this->is_multidimensional_aggregated) {
+				$root = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+				$value = $this->multidimensional_get($root, $this->id_data['keys'], $undefined);
 			} else {
 				$default = $this->default;
 				$this->default = $undefined; // Temporarily set default to undefined so we can detect if existing value is set.
 				$value = $this->value();
 				$this->default = $default;
 			}
-			$needs_preview = ( $undefined === $value ); // Because the default needs to be supplied.
+			$needs_preview = ($undefined === $value); // Because the default needs to be supplied.
 		}
 
 		// If the setting does not need previewing now, defer to when it has a value to preview.
-		if ( ! $needs_preview ) {
-			if ( ! has_action( "customize_post_value_set_{$this->id}", array( $this, 'preview' ) ) ) {
-				add_action( "customize_post_value_set_{$this->id}", array( $this, 'preview' ) );
+		if ( ! $needs_preview) {
+			if ( ! has_action("customize_post_value_set_{$this->id}", array($this, 'preview'))) {
+				add_action("customize_post_value_set_{$this->id}", array($this, 'preview'));
 			}
 			return false;
 		}
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'theme_mod' :
-				if ( ! $is_multidimensional ) {
-					add_filter( "theme_mod_{$id_base}", array( $this, '_preview_filter' ) );
+				if ( ! $is_multidimensional) {
+					add_filter("theme_mod_{$id_base}", array($this, '_preview_filter'));
 				} else {
-					if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+					if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 						// Only add this filter once for this ID base.
-						add_filter( "theme_mod_{$id_base}", $multidimensional_filter );
+						add_filter("theme_mod_{$id_base}", $multidimensional_filter);
 					}
-					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
+					self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'][$this->id] = $this;
 				}
 				break;
 			case 'option' :
-				if ( ! $is_multidimensional ) {
-					add_filter( "pre_option_{$id_base}", array( $this, '_preview_filter' ) );
+				if ( ! $is_multidimensional) {
+					add_filter("pre_option_{$id_base}", array($this, '_preview_filter'));
 				} else {
-					if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+					if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 						// Only add these filters once for this ID base.
-						add_filter( "option_{$id_base}", $multidimensional_filter );
-						add_filter( "default_option_{$id_base}", $multidimensional_filter );
+						add_filter("option_{$id_base}", $multidimensional_filter);
+						add_filter("default_option_{$id_base}", $multidimensional_filter);
 					}
-					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
+					self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'][$this->id] = $this;
 				}
 				break;
 			default :
@@ -351,7 +351,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 				 */
-				do_action( "customize_preview_{$this->id}", $this );
+				do_action("customize_preview_{$this->id}", $this);
 
 				/**
 				 * Fires when the WP_Customize_Setting::preview() method is called for settings
@@ -363,7 +363,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 				 */
-				do_action( "customize_preview_{$this->type}", $this );
+				do_action("customize_preview_{$this->type}", $this);
 		}
 
 		$this->is_previewed = true;
@@ -384,7 +384,7 @@ 
 	 * @see WP_Customize_Setting::_multidimensional_preview_filter()
 	 */
 	final public function _clear_aggregated_multidimensional_preview_applied_flag() {
-		unset( self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['preview_applied_instances'][ $this->id ] );
+		unset(self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['preview_applied_instances'][$this->id]);
 	}
 
 	/**
@@ -399,14 +399,14 @@ 
 	 * @param mixed $original Old value.
 	 * @return mixed New or old value.
 	 */
-	public function _preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	public function _preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$undefined = new stdClass(); // Symbol hack.
-		$post_value = $this->post_value( $undefined );
-		if ( $undefined !== $post_value ) {
+		$post_value = $this->post_value($undefined);
+		if ($undefined !== $post_value) {
 			$value = $post_value;
 		} else {
 			/*
@@ -432,35 +432,35 @@ 
 	 * @param mixed $original Original root value.
 	 * @return mixed New or old value.
 	 */
-	final public function _multidimensional_preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	final public function _multidimensional_preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$id_base = $this->id_data['base'];
 
 		// If no settings have been previewed yet (which should not be the case, since $this is), just pass through the original value.
-		if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+		if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 			return $original;
 		}
 
-		foreach ( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] as $previewed_setting ) {
+		foreach (self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'] as $previewed_setting) {
 			// Skip applying previewed value for any settings that have already been applied.
-			if ( ! empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['preview_applied_instances'][ $previewed_setting->id ] ) ) {
+			if ( ! empty(self::$aggregated_multidimensionals[$this->type][$id_base]['preview_applied_instances'][$previewed_setting->id])) {
 				continue;
 			}
 
 			// Do the replacements of the posted/default sub value into the root value.
-			$value = $previewed_setting->post_value( $previewed_setting->default );
-			$root = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
-			$root = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
-			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'] = $root;
+			$value = $previewed_setting->post_value($previewed_setting->default);
+			$root = self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['root_value'];
+			$root = $previewed_setting->multidimensional_replace($root, $previewed_setting->id_data['keys'], $value);
+			self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['root_value'] = $root;
 
 			// Mark this setting having been applied so that it will be skipped when the filter is called again.
-			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['preview_applied_instances'][ $previewed_setting->id ] = true;
+			self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['preview_applied_instances'][$previewed_setting->id] = true;
 		}
 
-		return self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
+		return self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
 	}
 
 	/**
@@ -476,7 +476,7 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) ) {
+		if ( ! $this->check_capabilities() || ! isset($value)) {
 			return false;
 		}
 
@@ -490,9 +490,9 @@ 
 		 *
 		 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 		 */
-		do_action( 'customize_save_' . $this->id_data['base'], $this );
+		do_action('customize_save_'.$this->id_data['base'], $this);
 
-		$this->update( $value );
+		$this->update($value);
 	}
 
 	/**
@@ -503,8 +503,8 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The default value on failure, otherwise the sanitized and validated value.
 	 */
-	final public function post_value( $default = null ) {
-		return $this->manager->post_value( $this, $default );
+	final public function post_value($default = null) {
+		return $this->manager->post_value($this, $default);
 	}
 
 	/**
@@ -515,7 +515,7 @@ 
 	 * @param string|array $value    The value to sanitize.
 	 * @return string|array|null|WP_Error Sanitized value, or `null`/`WP_Error` if invalid.
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		/**
 		 * Filters a Customize setting value in un-slashed form.
@@ -525,7 +525,7 @@ 
 		 * @param mixed                $value Value of the setting.
 		 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 		 */
-		return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+		return apply_filters("customize_sanitize_{$this->id}", $value, $this);
 	}
 
 	/**
@@ -539,12 +539,12 @@ 
 	 * @param mixed $value Value to validate.
 	 * @return true|WP_Error True if the input was validated, otherwise WP_Error.
 	 */
-	public function validate( $value ) {
-		if ( is_wp_error( $value ) ) {
+	public function validate($value) {
+		if (is_wp_error($value)) {
 			return $value;
 		}
-		if ( is_null( $value ) ) {
-			return new WP_Error( 'invalid_value', __( 'Invalid value.' ) );
+		if (is_null($value)) {
+			return new WP_Error('invalid_value', __('Invalid value.'));
 		}
 
 		$validity = new WP_Error();
@@ -562,9 +562,9 @@ 
 		 * @param mixed                $value    Value of the setting.
 		 * @param WP_Customize_Setting $this     WP_Customize_Setting instance.
 		 */
-		$validity = apply_filters( "customize_validate_{$this->id}", $validity, $value, $this );
+		$validity = apply_filters("customize_validate_{$this->id}", $validity, $value, $this);
 
-		if ( is_wp_error( $validity ) && empty( $validity->errors ) ) {
+		if (is_wp_error($validity) && empty($validity->errors)) {
 			$validity = true;
 		}
 		return $validity;
@@ -579,12 +579,12 @@ 
 	 * @param mixed $default Value to return if root does not exist.
 	 * @return mixed
 	 */
-	protected function get_root_value( $default = null ) {
+	protected function get_root_value($default = null) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type ) {
-			return get_option( $id_base, $default );
-		} else if ( 'theme_mod' ) {
-			return get_theme_mod( $id_base, $default );
+		if ('option' === $this->type) {
+			return get_option($id_base, $default);
+		} else if ('theme_mod') {
+			return get_theme_mod($id_base, $default);
 		} else {
 			/*
 			 * Any WP_Customize_Setting subclass implementing aggregate multidimensional
@@ -604,16 +604,16 @@ 
 	 * @param mixed $value Value to set as root of multidimensional setting.
 	 * @return bool Whether the multidimensional root was updated successfully.
 	 */
-	protected function set_root_value( $value ) {
+	protected function set_root_value($value) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type ) {
+		if ('option' === $this->type) {
 			$autoload = true;
-			if ( isset( self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] ) ) {
-				$autoload = self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'];
+			if (isset(self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'])) {
+				$autoload = self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'];
 			}
-			return update_option( $id_base, $value, $autoload );
-		} else if ( 'theme_mod' ) {
-			set_theme_mod( $id_base, $value );
+			return update_option($id_base, $value, $autoload);
+		} else if ('theme_mod') {
+			set_theme_mod($id_base, $value);
 			return true;
 		} else {
 			/*
@@ -633,16 +633,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return bool The result of saving the value.
 	 */
-	protected function update( $value ) {
+	protected function update($value) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type || 'theme_mod' === $this->type ) {
-			if ( ! $this->is_multidimensional_aggregated ) {
-				return $this->set_root_value( $value );
+		if ('option' === $this->type || 'theme_mod' === $this->type) {
+			if ( ! $this->is_multidimensional_aggregated) {
+				return $this->set_root_value($value);
 			} else {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-				$root = $this->multidimensional_replace( $root, $this->id_data['keys'], $value );
-				self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'] = $root;
-				return $this->set_root_value( $root );
+				$root = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+				$root = $this->multidimensional_replace($root, $this->id_data['keys'], $value);
+				self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'] = $root;
+				return $this->set_root_value($root);
 			}
 		} else {
 			/**
@@ -656,9 +656,9 @@ 
 			 * @param mixed                $value Value of the setting.
 			 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 			 */
-			do_action( "customize_update_{$this->type}", $value, $this );
+			do_action("customize_update_{$this->type}", $value, $this);
 
-			return has_action( "customize_update_{$this->type}" );
+			return has_action("customize_update_{$this->type}");
 		}
 	}
 
@@ -669,7 +669,7 @@ 
 	 * @deprecated 4.4.0 Deprecated in favor of update() method.
 	 */
 	protected function _update_theme_mod() {
-		_deprecated_function( __METHOD__, '4.4.0', __CLASS__ . '::update()' );
+		_deprecated_function(__METHOD__, '4.4.0', __CLASS__.'::update()');
 	}
 
 	/**
@@ -679,7 +679,7 @@ 
 	 * @deprecated 4.4.0 Deprecated in favor of update() method.
 	 */
 	protected function _update_option() {
-		_deprecated_function( __METHOD__, '4.4.0', __CLASS__ . '::update()' );
+		_deprecated_function(__METHOD__, '4.4.0', __CLASS__.'::update()');
 	}
 
 	/**
@@ -691,10 +691,10 @@ 
 	 */
 	public function value() {
 		$id_base = $this->id_data['base'];
-		$is_core_type = ( 'option' === $this->type || 'theme_mod' === $this->type );
+		$is_core_type = ('option' === $this->type || 'theme_mod' === $this->type);
 
-		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated ) {
-			$value = $this->get_root_value( $this->default );
+		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated) {
+			$value = $this->get_root_value($this->default);
 
 			/**
 			 * Filters a Customize setting value not handled as a theme_mod or option.
@@ -711,17 +711,17 @@ 
 			 * @param mixed                $default The setting default value. Default empty.
 			 * @param WP_Customize_Setting $this    The setting instance.
 			 */
-			$value = apply_filters( "customize_value_{$id_base}", $value, $this );
-		} elseif ( $this->is_multidimensional_aggregated ) {
-			$root_value = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-			$value = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
+			$value = apply_filters("customize_value_{$id_base}", $value, $this);
+		} elseif ($this->is_multidimensional_aggregated) {
+			$root_value = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+			$value = $this->multidimensional_get($root_value, $this->id_data['keys'], $this->default);
 
 			// Ensure that the post value is used if the setting is previewed, since preview filters aren't applying on cached $root_value.
-			if ( $this->is_previewed ) {
-				$value = $this->post_value( $value );
+			if ($this->is_previewed) {
+				$value = $this->post_value($value);
 			}
 		} else {
-			$value = $this->get_root_value( $this->default );
+			$value = $this->get_root_value($this->default);
 		}
 		return $value;
 	}
@@ -745,10 +745,10 @@ 
 		 * @param mixed                $value The setting value.
 		 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 		 */
-		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
+		$value = apply_filters("customize_sanitize_js_{$this->id}", $this->value(), $this);
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if (is_string($value))
+			return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 
 		return $value;
 	}
@@ -778,10 +778,10 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability))
 			return false;
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports))
 			return false;
 
 		return true;
@@ -797,37 +797,37 @@ 
 	 * @param bool $create Default is false.
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
-	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
+	final protected function multidimensional(&$root, $keys, $create = false) {
+		if ($create && empty($root))
 			$root = array();
 
-		if ( ! isset( $root ) || empty( $keys ) )
+		if ( ! isset($root) || empty($keys))
 			return;
 
-		$last = array_pop( $keys );
+		$last = array_pop($keys);
 		$node = &$root;
 
-		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+		foreach ($keys as $key) {
+			if ($create && ! isset($node[$key]))
+				$node[$key] = array();
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
+			if ( ! is_array($node) || ! isset($node[$key]))
 				return;
 
-			$node = &$node[ $key ];
+			$node = &$node[$key];
 		}
 
-		if ( $create ) {
-			if ( ! is_array( $node ) ) {
+		if ($create) {
+			if ( ! is_array($node)) {
 				// account for an array overriding a string or object value
 				$node = array();
 			}
-			if ( ! isset( $node[ $last ] ) ) {
-				$node[ $last ] = array();
+			if ( ! isset($node[$last])) {
+				$node[$last] = array();
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
+		if ( ! isset($node[$last]))
 			return;
 
 		return array(
@@ -847,16 +847,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return mixed
 	 */
-	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
+	final protected function multidimensional_replace($root, $keys, $value) {
+		if ( ! isset($value))
 			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		elseif (empty($keys)) // If there are no keys, we're replacing the root.
 			return $value;
 
-		$result = $this->multidimensional( $root, $keys, true );
+		$result = $this->multidimensional($root, $keys, true);
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if (isset($result))
+			$result['node'][$result['key']] = $value;
 
 		return $root;
 	}
@@ -871,12 +871,12 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The requested value or the default value.
 	 */
-	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
-			return isset( $root ) ? $root : $default;
+	final protected function multidimensional_get($root, $keys, $default = null) {
+		if (empty($keys)) // If there are no keys, test the root.
+			return isset($root) ? $root : $default;
 
-		$result = $this->multidimensional( $root, $keys );
-		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;
+		$result = $this->multidimensional($root, $keys);
+		return isset($result) ? $result['node'][$result['key']] : $default;
 	}
 
 	/**
@@ -888,23 +888,23 @@ 
 	 * @param $keys
 	 * @return bool True if value is set, false if not.
 	 */
-	final protected function multidimensional_isset( $root, $keys ) {
-		$result = $this->multidimensional_get( $root, $keys );
-		return isset( $result );
+	final protected function multidimensional_isset($root, $keys) {
+		$result = $this->multidimensional_get($root, $keys);
+		return isset($result);
 	}
 }
 
 /** WP_Customize_Filter_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
 
 /** WP_Customize_Header_Image_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
 
 /** WP_Customize_Background_Image_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
 
 /** WP_Customize_Nav_Menu_Item_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
 
 /** WP_Customize_Nav_Menu_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');

src/wp-includes/cron.php

Spacing +98 added lines, -98 removed lines

@@ -24,20 +24,20 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when an event is not scheduled.
  */
-function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
+function wp_schedule_single_event($timestamp, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	// Don't schedule a duplicate if there's already an identical event due within 10 minutes of it
 	$next = wp_next_scheduled($hook, $args);
-	if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
+	if ($next && abs($next - $timestamp) <= 10 * MINUTE_IN_SECONDS) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
+	$event = (object) array('hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args);
 	/**
 	 * Filters a single event before it is scheduled.
 	 *
@@ -45,17 +45,17 @@ 
 	 *
 	 * @param object $event An object containing an event's data.
 	 */
-	$event = apply_filters( 'schedule_event', $event );
+	$event = apply_filters('schedule_event', $event);
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event)
 		return false;
 
 	$key = md5(serialize($event->args));
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args );
-	uksort( $crons, "strnatcasecmp" );
-	_set_cron_array( $crons );
+	$crons[$event->timestamp][$event->hook][$key] = array('schedule' => $event->schedule, 'args' => $event->args);
+	uksort($crons, "strnatcasecmp");
+	_set_cron_array($crons);
 }
 
 /**
@@ -78,31 +78,31 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when an event is not scheduled.
  */
-function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+function wp_schedule_event($timestamp, $recurrence, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
 
-	if ( !isset( $schedules[$recurrence] ) )
+	if ( ! isset($schedules[$recurrence]))
 		return false;
 
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+	$event = (object) array('hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval']);
 	/** This filter is documented in wp-includes/cron.php */
-	$event = apply_filters( 'schedule_event', $event );
+	$event = apply_filters('schedule_event', $event);
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event)
 		return false;
 
 	$key = md5(serialize($event->args));
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval );
-	uksort( $crons, "strnatcasecmp" );
-	_set_cron_array( $crons );
+	$crons[$event->timestamp][$event->hook][$key] = array('schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval);
+	uksort($crons, "strnatcasecmp");
+	_set_cron_array($crons);
 }
 
 /**
@@ -116,39 +116,39 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when an event is not scheduled.
  */
-function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
+function wp_reschedule_event($timestamp, $recurrence, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
-	$key = md5( serialize( $args ) );
+	$key = md5(serialize($args));
 	$interval = 0;
 
 	// First we try to get it from the schedule
-	if ( isset( $schedules[ $recurrence ] ) ) {
-		$interval = $schedules[ $recurrence ]['interval'];
+	if (isset($schedules[$recurrence])) {
+		$interval = $schedules[$recurrence]['interval'];
 	}
 	// Now we try to get it from the saved interval in case the schedule disappears
-	if ( 0 == $interval ) {
-		$interval = $crons[ $timestamp ][ $hook ][ $key ]['interval'];
+	if (0 == $interval) {
+		$interval = $crons[$timestamp][$hook][$key]['interval'];
 	}
 	// Now we assume something is wrong and fail to schedule
-	if ( 0 == $interval ) {
+	if (0 == $interval) {
 		return false;
 	}
 
 	$now = time();
 
-	if ( $timestamp >= $now ) {
+	if ($timestamp >= $now) {
 		$timestamp = $now + $interval;
 	} else {
-		$timestamp = $now + ( $interval - ( ( $now - $timestamp ) % $interval ) );
+		$timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 	}
 
-	wp_schedule_event( $timestamp, $recurrence, $hook, $args );
+	wp_schedule_event($timestamp, $recurrence, $hook, $args);
 }
 
 /**
@@ -167,20 +167,20 @@ 
  * as those used when originally scheduling the event.
  * @return false|void False when an event is not unscheduled.
  */
-function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
+function wp_unschedule_event($timestamp, $hook, $args = array()) {
 	// Make sure timestamp is a positive integer
-	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+	if ( ! is_numeric($timestamp) || $timestamp <= 0) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	unset( $crons[$timestamp][$hook][$key] );
-	if ( empty($crons[$timestamp][$hook]) )
-		unset( $crons[$timestamp][$hook] );
-	if ( empty($crons[$timestamp]) )
-		unset( $crons[$timestamp] );
-	_set_cron_array( $crons );
+	unset($crons[$timestamp][$hook][$key]);
+	if (empty($crons[$timestamp][$hook]))
+		unset($crons[$timestamp][$hook]);
+	if (empty($crons[$timestamp]))
+		unset($crons[$timestamp]);
+	_set_cron_array($crons);
 }
 
 /**
@@ -191,25 +191,25 @@ 
  * @param string $hook Action hook, the execution of which will be unscheduled.
  * @param array $args Optional. Arguments that were to be pass to the hook's callback function.
  */
-function wp_clear_scheduled_hook( $hook, $args = array() ) {
+function wp_clear_scheduled_hook($hook, $args = array()) {
 	// Backward compatibility
 	// Previously this function took the arguments as discrete vars rather than an array like the rest of the API
-	if ( !is_array($args) ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
-		$args = array_slice( func_get_args(), 1 );
+	if ( ! is_array($args)) {
+		_deprecated_argument(__FUNCTION__, '3.0.0', __('This argument has changed to an array to match the behavior of the other cron functions.'));
+		$args = array_slice(func_get_args(), 1);
 	}
 
 	// This logic duplicates wp_next_scheduled()
 	// It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
 	// and, wp_next_scheduled() returns the same schedule in an infinite loop.
 	$crons = _get_cron_array();
-	if ( empty( $crons ) )
+	if (empty($crons))
 		return;
 
-	$key = md5( serialize( $args ) );
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[ $hook ][ $key ] ) ) {
-			wp_unschedule_event( $timestamp, $hook, $args );
+	$key = md5(serialize($args));
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key])) {
+			wp_unschedule_event($timestamp, $hook, $args);
 		}
 	}
 }
@@ -223,13 +223,13 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|int The UNIX timestamp of the next time the scheduled event will occur.
  */
-function wp_next_scheduled( $hook, $args = array() ) {
+function wp_next_scheduled($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
+	if (empty($crons))
 		return false;
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key]))
 			return $timestamp;
 	}
 	return false;
@@ -242,11 +242,11 @@ 
  *
  * @param int $gmt_time Optional. Unix timestamp. Default 0 (current time is used).
  */
-function spawn_cron( $gmt_time = 0 ) {
-	if ( ! $gmt_time )
-		$gmt_time = microtime( true );
+function spawn_cron($gmt_time = 0) {
+	if ( ! $gmt_time)
+		$gmt_time = microtime(true);
 
-	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
+	if (defined('DOING_CRON') || isset($_GET['doing_wp_cron']))
 		return;
 
 	/*
@@ -258,45 +258,45 @@ 
 	 */
 	$lock = get_transient('doing_cron');
 
-	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
+	if ($lock > $gmt_time + 10 * MINUTE_IN_SECONDS)
 		$lock = 0;
 
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
+	if ($lock + WP_CRON_LOCK_TIMEOUT > $gmt_time)
 		return;
 
 	//sanity check
 	$crons = _get_cron_array();
-	if ( !is_array($crons) )
+	if ( ! is_array($crons))
 		return;
 
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$keys = array_keys($crons);
+	if (isset($keys[0]) && $keys[0] > $gmt_time)
 		return;
 
-	if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
-		if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) ||  defined( 'XMLRPC_REQUEST' ) ) {
+	if (defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON) {
+		if ('GET' !== $_SERVER['REQUEST_METHOD'] || defined('DOING_AJAX') || defined('XMLRPC_REQUEST')) {
 			return;
 		}
 
-		$doing_wp_cron = sprintf( '%.22F', $gmt_time );
-		set_transient( 'doing_cron', $doing_wp_cron );
+		$doing_wp_cron = sprintf('%.22F', $gmt_time);
+		set_transient('doing_cron', $doing_wp_cron);
 
 		ob_start();
-		wp_redirect( add_query_arg( 'doing_wp_cron', $doing_wp_cron, wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+		wp_redirect(add_query_arg('doing_wp_cron', $doing_wp_cron, wp_unslash($_SERVER['REQUEST_URI'])));
 		echo ' ';
 
 		// flush any buffers and send the headers
-		while ( @ob_end_flush() );
+		while (@ob_end_flush());
 		flush();
 
-		WP_DEBUG ? include_once( ABSPATH . 'wp-cron.php' ) : @include_once( ABSPATH . 'wp-cron.php' );
+		WP_DEBUG ? include_once(ABSPATH.'wp-cron.php') : @include_once(ABSPATH.'wp-cron.php');
 		return;
 	}
 
 	// Set the cron lock with the current unix timestamp, when the cron is being spawned.
-	$doing_wp_cron = sprintf( '%.22F', $gmt_time );
-	set_transient( 'doing_cron', $doing_wp_cron );
+	$doing_wp_cron = sprintf('%.22F', $gmt_time);
+	set_transient('doing_cron', $doing_wp_cron);
 
 	/**
 	 * Filters the cron request arguments.
@@ -319,18 +319,18 @@ 
 	 * }
 	 * @param string $doing_wp_cron The unix timestamp of the cron lock.
 	 */
-	$cron_request = apply_filters( 'cron_request', array(
-		'url'  => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
+	$cron_request = apply_filters('cron_request', array(
+		'url'  => add_query_arg('doing_wp_cron', $doing_wp_cron, site_url('wp-cron.php')),
 		'key'  => $doing_wp_cron,
 		'args' => array(
 			'timeout'   => 0.01,
 			'blocking'  => false,
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			'sslverify' => apply_filters( 'https_local_ssl_verify', false )
+			'sslverify' => apply_filters('https_local_ssl_verify', false)
 		)
-	), $doing_wp_cron );
+	), $doing_wp_cron);
 
-	wp_remote_post( $cron_request['url'], $cron_request['args'] );
+	wp_remote_post($cron_request['url'], $cron_request['args']);
 }
 
 /**
@@ -340,24 +340,24 @@ 
  */
 function wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php
-	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
+	if (strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON))
 		return;
 
-	if ( false === $crons = _get_cron_array() )
+	if (false === $crons = _get_cron_array())
 		return;
 
-	$gmt_time = microtime( true );
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$gmt_time = microtime(true);
+	$keys = array_keys($crons);
+	if (isset($keys[0]) && $keys[0] > $gmt_time)
 		return;
 
 	$schedules = wp_get_schedules();
-	foreach ( $crons as $timestamp => $cronhooks ) {
-		if ( $timestamp > $gmt_time ) break;
-		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
+	foreach ($crons as $timestamp => $cronhooks) {
+		if ($timestamp > $gmt_time) break;
+		foreach ((array) $cronhooks as $hook => $args) {
+			if (isset($schedules[$hook]['callback']) && ! call_user_func($schedules[$hook]['callback']))
 				continue;
-			spawn_cron( $gmt_time );
+			spawn_cron($gmt_time);
 			break 2;
 		}
 	}
@@ -395,9 +395,9 @@ 
  */
 function wp_get_schedules() {
 	$schedules = array(
-		'hourly'     => array( 'interval' => HOUR_IN_SECONDS,      'display' => __( 'Once Hourly' ) ),
-		'twicedaily' => array( 'interval' => 12 * HOUR_IN_SECONDS, 'display' => __( 'Twice Daily' ) ),
-		'daily'      => array( 'interval' => DAY_IN_SECONDS,       'display' => __( 'Once Daily' ) ),
+		'hourly'     => array('interval' => HOUR_IN_SECONDS, 'display' => __('Once Hourly')),
+		'twicedaily' => array('interval' => 12 * HOUR_IN_SECONDS, 'display' => __('Twice Daily')),
+		'daily'      => array('interval' => DAY_IN_SECONDS, 'display' => __('Once Daily')),
 	);
 	/**
 	 * Filters the non-default cron schedules.
@@ -406,7 +406,7 @@ 
 	 *
 	 * @param array $new_schedules An array of non-default cron schedules. Default empty.
 	 */
-	return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
+	return array_merge(apply_filters('cron_schedules', array()), $schedules);
 }
 
 /**
@@ -421,10 +421,10 @@ 
 function wp_get_schedule($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
+	if (empty($crons))
 		return false;
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key]))
 			return $cron[$hook][$key]['schedule'];
 	}
 	return false;
@@ -442,12 +442,12 @@ 
  *
  * @return false|array CRON info array.
  */
-function _get_cron_array()  {
+function _get_cron_array() {
 	$cron = get_option('cron');
-	if ( ! is_array($cron) )
+	if ( ! is_array($cron))
 		return false;
 
-	if ( !isset($cron['version']) )
+	if ( ! isset($cron['version']))
 		$cron = _upgrade_cron_array($cron);
 
 	unset($cron['version']);
@@ -465,7 +465,7 @@ 
  */
 function _set_cron_array($cron) {
 	$cron['version'] = 2;
-	update_option( 'cron', $cron );
+	update_option('cron', $cron);
 }
 
 /**
@@ -480,19 +480,19 @@ 
  * @return array An upgraded Cron info array.
  */
 function _upgrade_cron_array($cron) {
-	if ( isset($cron['version']) && 2 == $cron['version'])
+	if (isset($cron['version']) && 2 == $cron['version'])
 		return $cron;
 
 	$new_cron = array();
 
-	foreach ( (array) $cron as $timestamp => $hooks) {
-		foreach ( (array) $hooks as $hook => $args ) {
+	foreach ((array) $cron as $timestamp => $hooks) {
+		foreach ((array) $hooks as $hook => $args) {
 			$key = md5(serialize($args['args']));
 			$new_cron[$timestamp][$hook][$key] = $args;
 		}
 	}
 
 	$new_cron['version'] = 2;
-	update_option( 'cron', $new_cron );
+	update_option('cron', $new_cron);
 	return $new_cron;
 }

src/wp-includes/l10n.php

Spacing +188 added lines, -188 removed lines

@@ -30,7 +30,7 @@ 
 function get_locale() {
 	global $locale, $wp_local_package;
 
-	if ( isset( $locale ) ) {
+	if (isset($locale)) {
 		/**
 		 * Filters WordPress install's locale ID.
 		 *
@@ -38,41 +38,41 @@ 
 		 *
 		 * @param string $locale The locale ID.
 		 */
-		return apply_filters( 'locale', $locale );
+		return apply_filters('locale', $locale);
 	}
 
-	if ( isset( $wp_local_package ) ) {
+	if (isset($wp_local_package)) {
 		$locale = $wp_local_package;
 	}
 
 	// WPLANG was defined in wp-config.
-	if ( defined( 'WPLANG' ) ) {
+	if (defined('WPLANG')) {
 		$locale = WPLANG;
 	}
 
 	// If multisite, check options.
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		// Don't check blog option when installing.
-		if ( wp_installing() || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
-			$ms_locale = get_site_option( 'WPLANG' );
+		if (wp_installing() || (false === $ms_locale = get_option('WPLANG'))) {
+			$ms_locale = get_site_option('WPLANG');
 		}
 
-		if ( $ms_locale !== false ) {
+		if ($ms_locale !== false) {
 			$locale = $ms_locale;
 		}
 	} else {
-		$db_locale = get_option( 'WPLANG' );
-		if ( $db_locale !== false ) {
+		$db_locale = get_option('WPLANG');
+		if ($db_locale !== false) {
 			$locale = $db_locale;
 		}
 	}
 
-	if ( empty( $locale ) ) {
+	if (empty($locale)) {
 		$locale = 'en_US';
 	}
 
 	/** This filter is documented in wp-includes/l10n.php */
-	return apply_filters( 'locale', $locale );
+	return apply_filters('locale', $locale);
 }
 
 /**
@@ -89,9 +89,9 @@ 
  *                       Default 'default'.
  * @return string Translated text
  */
-function translate( $text, $domain = 'default' ) {
-	$translations = get_translations_for_domain( $domain );
-	$translations = $translations->translate( $text );
+function translate($text, $domain = 'default') {
+	$translations = get_translations_for_domain($domain);
+	$translations = $translations->translate($text);
 
 	/**
 	 * Filters text with its translation.
@@ -102,7 +102,7 @@ 
 	 * @param string $text         Text to translate.
 	 * @param string $domain       Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'gettext', $translations, $text, $domain );
+	return apply_filters('gettext', $translations, $text, $domain);
 }
 
 /**
@@ -116,12 +116,12 @@ 
  * @param string $string A pipe-delimited string.
  * @return string Either $string or everything before the last pipe.
  */
-function before_last_bar( $string ) {
-	$last_bar = strrpos( $string, '|' );
-	if ( false === $last_bar ) {
+function before_last_bar($string) {
+	$last_bar = strrpos($string, '|');
+	if (false === $last_bar) {
 		return $string;
 	} else {
-		return substr( $string, 0, $last_bar );
+		return substr($string, 0, $last_bar);
 	}
 }
 
@@ -141,9 +141,9 @@ 
  *                        Default 'default'.
  * @return string Translated text on success, original text on failure.
  */
-function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
-	$translations = get_translations_for_domain( $domain );
-	$translations = $translations->translate( $text, $context );
+function translate_with_gettext_context($text, $context, $domain = 'default') {
+	$translations = get_translations_for_domain($domain);
+	$translations = $translations->translate($text, $context);
 	/**
 	 * Filters text with its translation based on context information.
 	 *
@@ -154,7 +154,7 @@ 
 	 * @param string $context      Context information for the translators.
 	 * @param string $domain       Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'gettext_with_context', $translations, $text, $context, $domain );
+	return apply_filters('gettext_with_context', $translations, $text, $context, $domain);
 }
 
 /**
@@ -169,8 +169,8 @@ 
  *                       Default 'default'.
  * @return string Translated text.
  */
-function __( $text, $domain = 'default' ) {
-	return translate( $text, $domain );
+function __($text, $domain = 'default') {
+	return translate($text, $domain);
 }
 
 /**
@@ -185,8 +185,8 @@ 
  *                       Default 'default'.
  * @return string Translated text on success, original text on failure.
  */
-function esc_attr__( $text, $domain = 'default' ) {
-	return esc_attr( translate( $text, $domain ) );
+function esc_attr__($text, $domain = 'default') {
+	return esc_attr(translate($text, $domain));
 }
 
 /**
@@ -201,8 +201,8 @@ 
  *                       Default 'default'.
  * @return string Translated text
  */
-function esc_html__( $text, $domain = 'default' ) {
-	return esc_html( translate( $text, $domain ) );
+function esc_html__($text, $domain = 'default') {
+	return esc_html(translate($text, $domain));
 }
 
 /**
@@ -214,8 +214,8 @@ 
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
  *                       Default 'default'.
  */
-function _e( $text, $domain = 'default' ) {
-	echo translate( $text, $domain );
+function _e($text, $domain = 'default') {
+	echo translate($text, $domain);
 }
 
 /**
@@ -227,8 +227,8 @@ 
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
  *                       Default 'default'.
  */
-function esc_attr_e( $text, $domain = 'default' ) {
-	echo esc_attr( translate( $text, $domain ) );
+function esc_attr_e($text, $domain = 'default') {
+	echo esc_attr(translate($text, $domain));
 }
 
 /**
@@ -240,8 +240,8 @@ 
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
  *                       Default 'default'.
  */
-function esc_html_e( $text, $domain = 'default' ) {
-	echo esc_html( translate( $text, $domain ) );
+function esc_html_e($text, $domain = 'default') {
+	echo esc_html(translate($text, $domain));
 }
 
 /**
@@ -261,8 +261,8 @@ 
  *                        Default 'default'.
  * @return string Translated context string without pipe.
  */
-function _x( $text, $context, $domain = 'default' ) {
-	return translate_with_gettext_context( $text, $context, $domain );
+function _x($text, $context, $domain = 'default') {
+	return translate_with_gettext_context($text, $context, $domain);
 }
 
 /**
@@ -276,8 +276,8 @@ 
  *                        Default 'default'.
  * @return string Translated context string without pipe.
  */
-function _ex( $text, $context, $domain = 'default' ) {
-	echo _x( $text, $context, $domain );
+function _ex($text, $context, $domain = 'default') {
+	echo _x($text, $context, $domain);
 }
 
 /**
@@ -291,8 +291,8 @@ 
  *                        Default 'default'.
  * @return string Translated text
  */
-function esc_attr_x( $text, $context, $domain = 'default' ) {
-	return esc_attr( translate_with_gettext_context( $text, $context, $domain ) );
+function esc_attr_x($text, $context, $domain = 'default') {
+	return esc_attr(translate_with_gettext_context($text, $context, $domain));
 }
 
 /**
@@ -306,8 +306,8 @@ 
  *                        Default 'default'.
  * @return string Translated text.
  */
-function esc_html_x( $text, $context, $domain = 'default' ) {
-	return esc_html( translate_with_gettext_context( $text, $context, $domain ) );
+function esc_html_x($text, $context, $domain = 'default') {
+	return esc_html(translate_with_gettext_context($text, $context, $domain));
 }
 
 /**
@@ -329,9 +329,9 @@ 
  *                       Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _n( $single, $plural, $number, $domain = 'default' ) {
-	$translations = get_translations_for_domain( $domain );
-	$translation = $translations->translate_plural( $single, $plural, $number );
+function _n($single, $plural, $number, $domain = 'default') {
+	$translations = get_translations_for_domain($domain);
+	$translation = $translations->translate_plural($single, $plural, $number);
 
 	/**
 	 * Filters the singular or plural form of a string.
@@ -344,7 +344,7 @@ 
 	 * @param string $number      The number to compare against to use either the singular or plural form.
 	 * @param string $domain      Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain );
+	return apply_filters('ngettext', $translation, $single, $plural, $number, $domain);
 }
 
 /**
@@ -370,8 +370,8 @@ 
  * @return string The translated singular or plural form.
  */
 function _nx($single, $plural, $number, $context, $domain = 'default') {
-	$translations = get_translations_for_domain( $domain );
-	$translation = $translations->translate_plural( $single, $plural, $number, $context );
+	$translations = get_translations_for_domain($domain);
+	$translation = $translations->translate_plural($single, $plural, $number, $context);
 
 	/**
 	 * Filters the singular or plural form of a string with gettext context.
@@ -385,7 +385,7 @@ 
 	 * @param string $context     Context information for the translators.
 	 * @param string $domain      Text domain. Unique identifier for retrieving translated strings.
 	 */
-	return apply_filters( 'ngettext_with_context', $translation, $single, $plural, $number, $context, $domain );
+	return apply_filters('ngettext_with_context', $translation, $single, $plural, $number, $context, $domain);
 }
 
 /**
@@ -421,8 +421,8 @@ 
  *     @type string $domain   Text domain.
  * }
  */
-function _n_noop( $singular, $plural, $domain = null ) {
-	return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain );
+function _n_noop($singular, $plural, $domain = null) {
+	return array(0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain);
 }
 
 /**
@@ -460,8 +460,8 @@ 
  *     @type string $domain   Text domain.
  * }
  */
-function _nx_noop( $singular, $plural, $context, $domain = null ) {
-	return array( 0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain );
+function _nx_noop($singular, $plural, $context, $domain = null) {
+	return array(0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain);
 }
 
 /**
@@ -488,14 +488,14 @@ 
  *                              a text domain passed to _n_noop() or _nx_noop(), it will override this value. Default 'default'.
  * @return string Either $single or $plural translated text.
  */
-function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
-	if ( $nooped_plural['domain'] )
+function translate_nooped_plural($nooped_plural, $count, $domain = 'default') {
+	if ($nooped_plural['domain'])
 		$domain = $nooped_plural['domain'];
 
-	if ( $nooped_plural['context'] )
-		return _nx( $nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain );
+	if ($nooped_plural['context'])
+		return _nx($nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain);
 	else
-		return _n( $nooped_plural['singular'], $nooped_plural['plural'], $count, $domain );
+		return _n($nooped_plural['singular'], $nooped_plural['plural'], $count, $domain);
 }
 
 /**
@@ -516,7 +516,7 @@ 
  * @param string $mofile Path to the .mo file.
  * @return bool True on success, false on failure.
  */
-function load_textdomain( $domain, $mofile ) {
+function load_textdomain($domain, $mofile) {
 	global $l10n, $l10n_unloaded;
 
 	$l10n_unloaded = (array) $l10n_unloaded;
@@ -530,10 +530,10 @@ 
 	 * @param string $domain   Text domain. Unique identifier for retrieving translated strings.
 	 * @param string $mofile   Path to the MO file.
 	 */
-	$plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile );
+	$plugin_override = apply_filters('override_load_textdomain', false, $domain, $mofile);
 
-	if ( true == $plugin_override ) {
-		unset( $l10n_unloaded[ $domain ] );
+	if (true == $plugin_override) {
+		unset($l10n_unloaded[$domain]);
 
 		return true;
 	}
@@ -546,7 +546,7 @@ 
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 * @param string $mofile Path to the .mo file.
 	 */
-	do_action( 'load_textdomain', $domain, $mofile );
+	do_action('load_textdomain', $domain, $mofile);
 
 	/**
 	 * Filters MO file path for loading translations for a specific text domain.
@@ -556,17 +556,17 @@ 
 	 * @param string $mofile Path to the MO file.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
+	$mofile = apply_filters('load_textdomain_mofile', $mofile, $domain);
 
-	if ( !is_readable( $mofile ) ) return false;
+	if ( ! is_readable($mofile)) return false;
 
 	$mo = new MO();
-	if ( !$mo->import_from_file( $mofile ) ) return false;
+	if ( ! $mo->import_from_file($mofile)) return false;
 
-	if ( isset( $l10n[$domain] ) )
-		$mo->merge_with( $l10n[$domain] );
+	if (isset($l10n[$domain]))
+		$mo->merge_with($l10n[$domain]);
 
-	unset( $l10n_unloaded[ $domain ] );
+	unset($l10n_unloaded[$domain]);
 
 	$l10n[$domain] = &$mo;
 
@@ -584,7 +584,7 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool Whether textdomain was unloaded.
  */
-function unload_textdomain( $domain ) {
+function unload_textdomain($domain) {
 	global $l10n, $l10n_unloaded;
 
 	$l10n_unloaded = (array) $l10n_unloaded;
@@ -597,10 +597,10 @@ 
 	 * @param bool   $override Whether to override the text domain unloading. Default false.
 	 * @param string $domain   Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$plugin_override = apply_filters( 'override_unload_textdomain', false, $domain );
+	$plugin_override = apply_filters('override_unload_textdomain', false, $domain);
 
-	if ( $plugin_override ) {
-		$l10n_unloaded[ $domain ] = true;
+	if ($plugin_override) {
+		$l10n_unloaded[$domain] = true;
 
 		return true;
 	}
@@ -612,12 +612,12 @@ 
 	 *
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	do_action( 'unload_textdomain', $domain );
+	do_action('unload_textdomain', $domain);
 
-	if ( isset( $l10n[$domain] ) ) {
-		unset( $l10n[$domain] );
+	if (isset($l10n[$domain])) {
+		unset($l10n[$domain]);
 
-		$l10n_unloaded[ $domain ] = true;
+		$l10n_unloaded[$domain] = true;
 
 		return true;
 	}
@@ -638,27 +638,27 @@ 
  * @param string $locale Optional. Locale to load. Default is the value of get_locale().
  * @return bool Whether the textdomain was loaded.
  */
-function load_default_textdomain( $locale = null ) {
-	if ( null === $locale ) {
+function load_default_textdomain($locale = null) {
+	if (null === $locale) {
 		$locale = get_locale();
 	}
 
 	// Unload previously loaded strings so we can switch translations.
-	unload_textdomain( 'default' );
+	unload_textdomain('default');
 
-	$return = load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
+	$return = load_textdomain('default', WP_LANG_DIR."/$locale.mo");
 
-	if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists(  WP_LANG_DIR . "/admin-$locale.mo" ) ) {
-		load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
+	if ((is_multisite() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK)) && ! file_exists(WP_LANG_DIR."/admin-$locale.mo")) {
+		load_textdomain('default', WP_LANG_DIR."/ms-$locale.mo");
 		return $return;
 	}
 
-	if ( is_admin() || wp_installing() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) {
-		load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
+	if (is_admin() || wp_installing() || (defined('WP_REPAIRING') && WP_REPAIRING)) {
+		load_textdomain('default', WP_LANG_DIR."/admin-$locale.mo");
 	}
 
-	if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) )
-		load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
+	if (is_network_admin() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK))
+		load_textdomain('default', WP_LANG_DIR."/admin-network-$locale.mo");
 
 	return $return;
 }
@@ -679,7 +679,7 @@ 
  *                                Default false.
  * @return bool True when textdomain is successfully loaded, false otherwise.
  */
-function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path = false ) {
+function load_plugin_textdomain($domain, $deprecated = false, $plugin_rel_path = false) {
 	/**
 	 * Filters a plugin's locale.
 	 *
@@ -688,25 +688,25 @@ 
 	 * @param string $locale The plugin's current locale.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+	$locale = apply_filters('plugin_locale', get_locale(), $domain);
 
-	$mofile = $domain . '-' . $locale . '.mo';
+	$mofile = $domain.'-'.$locale.'.mo';
 
 	// Try to load from the languages directory first.
-	if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+	if (load_textdomain($domain, WP_LANG_DIR.'/plugins/'.$mofile)) {
 		return true;
 	}
 
-	if ( false !== $plugin_rel_path ) {
-		$path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
-	} elseif ( false !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '2.7.0' );
-		$path = ABSPATH . trim( $deprecated, '/' );
+	if (false !== $plugin_rel_path) {
+		$path = WP_PLUGIN_DIR.'/'.trim($plugin_rel_path, '/');
+	} elseif (false !== $deprecated) {
+		_deprecated_argument(__FUNCTION__, '2.7.0');
+		$path = ABSPATH.trim($deprecated, '/');
 	} else {
 		$path = WP_PLUGIN_DIR;
 	}
 
-	return load_textdomain( $domain, $path . '/' . $mofile );
+	return load_textdomain($domain, $path.'/'.$mofile);
 }
 
 /**
@@ -720,20 +720,20 @@ 
  *                                   file resides. Default empty string.
  * @return bool True when textdomain is successfully loaded, false otherwise.
  */
-function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
+function load_muplugin_textdomain($domain, $mu_plugin_rel_path = '') {
 	/** This filter is documented in wp-includes/l10n.php */
-	$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+	$locale = apply_filters('plugin_locale', get_locale(), $domain);
 
-	$mofile = $domain . '-' . $locale . '.mo';
+	$mofile = $domain.'-'.$locale.'.mo';
 
 	// Try to load from the languages directory first.
-	if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+	if (load_textdomain($domain, WP_LANG_DIR.'/plugins/'.$mofile)) {
 		return true;
 	}
 
-	$path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) );
+	$path = trailingslashit(WPMU_PLUGIN_DIR.'/'.ltrim($mu_plugin_rel_path, '/'));
 
-	return load_textdomain( $domain, $path . '/' . $mofile );
+	return load_textdomain($domain, $path.'/'.$mofile);
 }
 
 /**
@@ -752,7 +752,7 @@ 
  *                       Default false.
  * @return bool True when textdomain is successfully loaded, false otherwise.
  */
-function load_theme_textdomain( $domain, $path = false ) {
+function load_theme_textdomain($domain, $path = false) {
 	/**
 	 * Filters a theme's locale.
 	 *
@@ -761,20 +761,20 @@ 
 	 * @param string $locale The theme's current locale.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$locale = apply_filters( 'theme_locale', get_locale(), $domain );
+	$locale = apply_filters('theme_locale', get_locale(), $domain);
 
-	$mofile = $domain . '-' . $locale . '.mo';
+	$mofile = $domain.'-'.$locale.'.mo';
 
 	// Try to load from the languages directory first.
-	if ( load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile ) ) {
+	if (load_textdomain($domain, WP_LANG_DIR.'/themes/'.$mofile)) {
 		return true;
 	}
 
-	if ( ! $path ) {
+	if ( ! $path) {
 		$path = get_template_directory();
 	}
 
-	return load_textdomain( $domain, $path . '/' . $locale . '.mo' );
+	return load_textdomain($domain, $path.'/'.$locale.'.mo');
 }
 
 /**
@@ -792,10 +792,10 @@ 
  *                       Default false.
  * @return bool True when the theme textdomain is successfully loaded, false otherwise.
  */
-function load_child_theme_textdomain( $domain, $path = false ) {
-	if ( ! $path )
+function load_child_theme_textdomain($domain, $path = false) {
+	if ( ! $path)
 		$path = get_stylesheet_directory();
-	return load_theme_textdomain( $domain, $path );
+	return load_theme_textdomain($domain, $path);
 }
 
 /**
@@ -816,7 +816,7 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool True when the textdomain is successfully loaded, false otherwise.
  */
-function _load_textdomain_just_in_time( $domain ) {
+function _load_textdomain_just_in_time($domain) {
 	global $l10n_unloaded;
 
 	$l10n_unloaded = (array) $l10n_unloaded;
@@ -824,20 +824,20 @@ 
 	static $cached_mofiles = null;
 
 	// Short-circuit if domain is 'default' which is reserved for core.
-	if ( 'default' === $domain || isset( $l10n_unloaded[ $domain ] ) ) {
+	if ('default' === $domain || isset($l10n_unloaded[$domain])) {
 		return false;
 	}
 
-	if ( null === $cached_mofiles ) {
+	if (null === $cached_mofiles) {
 		$cached_mofiles = array();
 
 		$locations = array(
-			WP_LANG_DIR . '/plugins',
-			WP_LANG_DIR . '/themes',
+			WP_LANG_DIR.'/plugins',
+			WP_LANG_DIR.'/themes',
 		);
 
-		foreach ( $locations as $location ) {
-			foreach ( get_available_languages( $location ) as $file ) {
+		foreach ($locations as $location) {
+			foreach (get_available_languages($location) as $file) {
 				$cached_mofiles[] = "{$location}/{$file}.mo";
 			}
 		}
@@ -846,12 +846,12 @@ 
 	$locale = get_locale();
 	$mofile = "{$domain}-{$locale}.mo";
 
-	if ( in_array( WP_LANG_DIR . '/plugins/' . $mofile, $cached_mofiles ) ) {
-		return load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile );
+	if (in_array(WP_LANG_DIR.'/plugins/'.$mofile, $cached_mofiles)) {
+		return load_textdomain($domain, WP_LANG_DIR.'/plugins/'.$mofile);
 	}
 
-	if ( in_array( WP_LANG_DIR . '/themes/' . $mofile, $cached_mofiles ) ) {
-		return load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile );
+	if (in_array(WP_LANG_DIR.'/themes/'.$mofile, $cached_mofiles)) {
+		return load_textdomain($domain, WP_LANG_DIR.'/themes/'.$mofile);
 	}
 
 	return false;
@@ -869,14 +869,14 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return Translations|NOOP_Translations A Translations instance.
  */
-function get_translations_for_domain( $domain ) {
+function get_translations_for_domain($domain) {
 	global $l10n;
-	if ( isset( $l10n[ $domain ] ) || ( _load_textdomain_just_in_time( $domain ) && isset( $l10n[ $domain ] ) ) ) {
-		return $l10n[ $domain ];
+	if (isset($l10n[$domain]) || (_load_textdomain_just_in_time($domain) && isset($l10n[$domain]))) {
+		return $l10n[$domain];
 	}
 
 	static $noop_translations = null;
-	if ( null === $noop_translations ) {
+	if (null === $noop_translations) {
 		$noop_translations = new NOOP_Translations;
 	}
 
@@ -893,9 +893,9 @@ 
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool Whether there are translations.
  */
-function is_textdomain_loaded( $domain ) {
+function is_textdomain_loaded($domain) {
 	global $l10n;
-	return isset( $l10n[ $domain ] );
+	return isset($l10n[$domain]);
 }
 
 /**
@@ -915,8 +915,8 @@ 
  * @param string $name The role name.
  * @return string Translated role name on success, original name on failure.
  */
-function translate_user_role( $name ) {
-	return translate_with_gettext_context( before_last_bar($name), 'User role' );
+function translate_user_role($name) {
+	return translate_with_gettext_context(before_last_bar($name), 'User role');
 }
 
 /**
@@ -930,15 +930,15 @@ 
  *                    Default WP_LANG_DIR.
  * @return array An array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names.
  */
-function get_available_languages( $dir = null ) {
+function get_available_languages($dir = null) {
 	$languages = array();
 
-	$lang_files = glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' );
-	if ( $lang_files ) {
-		foreach ( $lang_files as $lang_file ) {
-			$lang_file = basename( $lang_file, '.mo' );
-			if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) &&
-				0 !== strpos( $lang_file, 'admin-' ) ) {
+	$lang_files = glob((is_null($dir) ? WP_LANG_DIR : $dir).'/*.mo');
+	if ($lang_files) {
+		foreach ($lang_files as $lang_file) {
+			$lang_file = basename($lang_file, '.mo');
+			if (0 !== strpos($lang_file, 'continents-cities') && 0 !== strpos($lang_file, 'ms-') &&
+				0 !== strpos($lang_file, 'admin-')) {
 				$languages[] = $lang_file;
 			}
 		}
@@ -958,43 +958,43 @@ 
  * @param string $type What to search for. Accepts 'plugins', 'themes', 'core'.
  * @return array Array of language data.
  */
-function wp_get_installed_translations( $type ) {
-	if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' )
+function wp_get_installed_translations($type) {
+	if ($type !== 'themes' && $type !== 'plugins' && $type !== 'core')
 		return array();
 
 	$dir = 'core' === $type ? '' : "/$type";
 
-	if ( ! is_dir( WP_LANG_DIR ) )
+	if ( ! is_dir(WP_LANG_DIR))
 		return array();
 
-	if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) )
+	if ($dir && ! is_dir(WP_LANG_DIR.$dir))
 		return array();
 
-	$files = scandir( WP_LANG_DIR . $dir );
-	if ( ! $files )
+	$files = scandir(WP_LANG_DIR.$dir);
+	if ( ! $files)
 		return array();
 
 	$language_data = array();
 
-	foreach ( $files as $file ) {
-		if ( '.' === $file[0] || is_dir( WP_LANG_DIR . "$dir/$file" ) ) {
+	foreach ($files as $file) {
+		if ('.' === $file[0] || is_dir(WP_LANG_DIR."$dir/$file")) {
 			continue;
 		}
-		if ( substr( $file, -3 ) !== '.po' ) {
+		if (substr($file, -3) !== '.po') {
 			continue;
 		}
-		if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) {
+		if ( ! preg_match('/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match)) {
 			continue;
 		}
-		if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) )  {
+		if ( ! in_array(substr($file, 0, -3).'.mo', $files)) {
 			continue;
 		}
 
-		list( , $textdomain, $language ) = $match;
-		if ( '' === $textdomain ) {
+		list(, $textdomain, $language) = $match;
+		if ('' === $textdomain) {
 			$textdomain = 'default';
 		}
-		$language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "$dir/$file" );
+		$language_data[$textdomain][$language] = wp_get_pomo_file_data(WP_LANG_DIR."$dir/$file");
 	}
 	return $language_data;
 }
@@ -1007,16 +1007,16 @@ 
  * @param string $po_file Path to PO file.
  * @return array PO file headers.
  */
-function wp_get_pomo_file_data( $po_file ) {
-	$headers = get_file_data( $po_file, array(
+function wp_get_pomo_file_data($po_file) {
+	$headers = get_file_data($po_file, array(
 		'POT-Creation-Date'  => '"POT-Creation-Date',
 		'PO-Revision-Date'   => '"PO-Revision-Date',
 		'Project-Id-Version' => '"Project-Id-Version',
 		'X-Generator'        => '"X-Generator',
-	) );
-	foreach ( $headers as $header => $value ) {
+	));
+	foreach ($headers as $header => $value) {
 		// Remove possible contextual '\n' and closing double quote.
-		$headers[ $header ] = preg_replace( '~(\\\n)?"$~', '', $value );
+		$headers[$header] = preg_replace('~(\\\n)?"$~', '', $value);
 	}
 	return $headers;
 }
@@ -1046,9 +1046,9 @@ 
  * }
  * @return string HTML content
  */
-function wp_dropdown_languages( $args = array() ) {
+function wp_dropdown_languages($args = array()) {
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		'id'           => '',
 		'name'         => '',
 		'languages'    => array(),
@@ -1056,11 +1056,11 @@ 
 		'selected'     => '',
 		'echo'         => 1,
 		'show_available_translations' => true,
-	) );
+	));
 
 	$translations = $args['translations'];
-	if ( empty( $translations ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+	if (empty($translations)) {
+		require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 		$translations = wp_get_available_translations();
 	}
 
@@ -1069,17 +1069,17 @@ 
 	 * $translations to get the native name. Fall back to locale.
 	 */
 	$languages = array();
-	foreach ( $args['languages'] as $locale ) {
-		if ( isset( $translations[ $locale ] ) ) {
-			$translation = $translations[ $locale ];
+	foreach ($args['languages'] as $locale) {
+		if (isset($translations[$locale])) {
+			$translation = $translations[$locale];
 			$languages[] = array(
 				'language'    => $translation['language'],
 				'native_name' => $translation['native_name'],
-				'lang'        => current( $translation['iso'] ),
+				'lang'        => current($translation['iso']),
 			);
 
 			// Remove installed language from available translations.
-			unset( $translations[ $locale ] );
+			unset($translations[$locale]);
 		} else {
 			$languages[] = array(
 				'language'    => $locale,
@@ -1089,51 +1089,51 @@ 
 		}
 	}
 
-	$translations_available = ( ! empty( $translations ) && $args['show_available_translations'] );
+	$translations_available = ( ! empty($translations) && $args['show_available_translations']);
 
-	$output = sprintf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) );
+	$output = sprintf('<select name="%s" id="%s">', esc_attr($args['name']), esc_attr($args['id']));
 
 	// Holds the HTML markup.
 	$structure = array();
 
 	// List installed languages.
-	if ( $translations_available ) {
-		$structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
+	if ($translations_available) {
+		$structure[] = '<optgroup label="'.esc_attr_x('Installed', 'translations').'">';
 	}
 	$structure[] = '<option value="" lang="en" data-installed="1">English (United States)</option>';
-	foreach ( $languages as $language ) {
+	foreach ($languages as $language) {
 		$structure[] = sprintf(
 			'<option value="%s" lang="%s"%s data-installed="1">%s</option>',
-			esc_attr( $language['language'] ),
-			esc_attr( $language['lang'] ),
-			selected( $language['language'], $args['selected'], false ),
-			esc_html( $language['native_name'] )
+			esc_attr($language['language']),
+			esc_attr($language['lang']),
+			selected($language['language'], $args['selected'], false),
+			esc_html($language['native_name'])
 		);
 	}
-	if ( $translations_available ) {
+	if ($translations_available) {
 		$structure[] = '</optgroup>';
 	}
 
 	// List available translations.
-	if ( $translations_available ) {
-		$structure[] = '<optgroup label="' . esc_attr_x( 'Available', 'translations' ) . '">';
-		foreach ( $translations as $translation ) {
+	if ($translations_available) {
+		$structure[] = '<optgroup label="'.esc_attr_x('Available', 'translations').'">';
+		foreach ($translations as $translation) {
 			$structure[] = sprintf(
 				'<option value="%s" lang="%s"%s>%s</option>',
-				esc_attr( $translation['language'] ),
-				esc_attr( current( $translation['iso'] ) ),
-				selected( $translation['language'], $args['selected'], false ),
-				esc_html( $translation['native_name'] )
+				esc_attr($translation['language']),
+				esc_attr(current($translation['iso'])),
+				selected($translation['language'], $args['selected'], false),
+				esc_html($translation['native_name'])
 			);
 		}
 		$structure[] = '</optgroup>';
 	}
 
-	$output .= join( "\n", $structure );
+	$output .= join("\n", $structure);
 
 	$output .= '</select>';
 
-	if ( $args['echo'] ) {
+	if ($args['echo']) {
 		echo $output;
 	}
 

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

Spacing +287 added lines, -287 removed lines

@@ -198,19 +198,19 @@ 
 	 * @param string $theme_root Theme root.
 	 * @param WP_Error|void $_child If this theme is a parent theme, the child may be passed for validation purposes.
 	 */
-	public function __construct( $theme_dir, $theme_root, $_child = null ) {
+	public function __construct($theme_dir, $theme_root, $_child = null) {
 		global $wp_theme_directories;
 
 		// Initialize caching on first run.
-		if ( ! isset( self::$persistently_cache ) ) {
+		if ( ! isset(self::$persistently_cache)) {
 			/** This action is documented in wp-includes/theme.php */
-			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
-			if ( self::$persistently_cache ) {
-				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
+			self::$persistently_cache = apply_filters('wp_cache_themes_persistently', false, 'WP_Theme');
+			if (self::$persistently_cache) {
+				wp_cache_add_global_groups('themes');
+				if (is_int(self::$persistently_cache))
 					self::$cache_expiration = self::$persistently_cache;
 			} else {
-				wp_cache_add_non_persistent_groups( 'themes' );
+				wp_cache_add_non_persistent_groups('themes');
 			}
 		}
 
@@ -218,114 +218,114 @@ 
 		$this->stylesheet = $theme_dir;
 
 		// Correct a situation where the theme is 'some-directory/some-theme' but 'some-directory' was passed in as part of the theme root instead.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) && in_array( dirname( $theme_root ), (array) $wp_theme_directories ) ) {
-			$this->stylesheet = basename( $this->theme_root ) . '/' . $this->stylesheet;
-			$this->theme_root = dirname( $theme_root );
+		if ( ! in_array($theme_root, (array) $wp_theme_directories) && in_array(dirname($theme_root), (array) $wp_theme_directories)) {
+			$this->stylesheet = basename($this->theme_root).'/'.$this->stylesheet;
+			$this->theme_root = dirname($theme_root);
 		}
 
-		$this->cache_hash = md5( $this->theme_root . '/' . $this->stylesheet );
-		$theme_file = $this->stylesheet . '/style.css';
+		$this->cache_hash = md5($this->theme_root.'/'.$this->stylesheet);
+		$theme_file = $this->stylesheet.'/style.css';
 
-		$cache = $this->cache_get( 'theme' );
+		$cache = $this->cache_get('theme');
 
-		if ( is_array( $cache ) ) {
-			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+		if (is_array($cache)) {
+			foreach (array('errors', 'headers', 'template') as $key) {
+				if (isset($cache[$key]))
+					$this->$key = $cache[$key];
 			}
-			if ( $this->errors )
+			if ($this->errors)
 				return;
-			if ( isset( $cache['theme_root_template'] ) )
+			if (isset($cache['theme_root_template']))
 				$theme_root_template = $cache['theme_root_template'];
-		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! file_exists($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet))
+				$this->errors = new WP_Error('theme_not_found', sprintf(__('The theme directory "%s" does not exist.'), esc_html($this->stylesheet)));
 			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+				$this->errors = new WP_Error('theme_no_stylesheet', __('Stylesheet is missing.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
-				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+			if ( ! file_exists($this->theme_root)) // Don't cache this one.
+				$this->errors->add('theme_root_missing', __('ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.'));
 			return;
-		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! is_readable($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			$this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
+			$this->errors = new WP_Error('theme_stylesheet_not_readable', __('Stylesheet is not readable.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 			return;
 		} else {
-			$this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
+			$this->headers = get_file_data($this->theme_root.'/'.$theme_file, self::$file_headers, 'theme');
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
-			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+			if ($default_theme_slug = array_search($this->headers['Name'], self::$default_themes)) {
+				if (basename($this->stylesheet) != $default_theme_slug)
+					$this->headers['Name'] .= '/'.$this->stylesheet;
 			}
 		}
 
 		// (If template is set from cache [and there are no errors], we know it's good.)
-		if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
+		if ( ! $this->template && ! ($this->template = $this->headers['Template'])) {
 			$this->template = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet.'/index.php')) {
 				$error_message = sprintf(
 					/* translators: 1: index.php, 2: Codex URL, 3: style.css */
-					__( 'Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.' ),
+					__('Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.'),
 					'<code>index.php</code>',
-					__( 'https://codex.wordpress.org/Child_Themes' ),
+					__('https://codex.wordpress.org/Child_Themes'),
 					'<code>style.css</code>'
 				);
-				$this->errors = new WP_Error( 'theme_no_index', $error_message );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				$this->errors = new WP_Error('theme_no_index', $error_message);
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				return;
 			}
 		}
 
 		// If we got our data from cache, we can assume that 'template' is pointing to the right place.
-		if ( ! is_array( $cache ) && $this->template != $this->stylesheet && ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' ) ) {
+		if ( ! is_array($cache) && $this->template != $this->stylesheet && ! file_exists($this->theme_root.'/'.$this->template.'/index.php')) {
 			// If we're in a directory of themes inside /themes, look for the parent nearby.
 			// wp-content/themes/directory-of-themes/*
-			$parent_dir = dirname( $this->stylesheet );
-			if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
-				$this->template = $parent_dir . '/' . $this->template;
-			} elseif ( ( $directories = search_theme_directories() ) && isset( $directories[ $this->template ] ) ) {
+			$parent_dir = dirname($this->stylesheet);
+			if ('.' != $parent_dir && file_exists($this->theme_root.'/'.$parent_dir.'/'.$this->template.'/index.php')) {
+				$this->template = $parent_dir.'/'.$this->template;
+			} elseif (($directories = search_theme_directories()) && isset($directories[$this->template])) {
 				// Look for the template in the search_theme_directories() results, in case it is in another theme root.
 				// We don't look into directories of themes, just the theme root.
-				$theme_root_template = $directories[ $this->template ]['theme_root'];
+				$theme_root_template = $directories[$this->template]['theme_root'];
 			} else {
 				// Parent theme is missing.
-				$this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), esc_html( $this->template ) ) );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-				$this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
+				$this->errors = new WP_Error('theme_no_parent', sprintf(__('The parent theme is missing. Please install the "%s" parent theme.'), esc_html($this->template)));
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+				$this->parent = new WP_Theme($this->template, $this->theme_root, $this);
 				return;
 			}
 		}
 
 		// Set the parent, if we're a child theme.
-		if ( $this->template != $this->stylesheet ) {
+		if ($this->template != $this->stylesheet) {
 			// If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
-			if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
+			if ($_child instanceof WP_Theme && $_child->template == $this->stylesheet) {
 				$_child->parent = null;
-				$_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $_child->template ) ) );
-				$_child->cache_add( 'theme', array( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
+				$_child->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), esc_html($_child->template)));
+				$_child->cache_add('theme', array('headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template));
 				// The two themes actually reference each other with the Template header.
-				if ( $_child->stylesheet == $this->template ) {
-					$this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $this->template ) ) );
-					$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				if ($_child->stylesheet == $this->template) {
+					$this->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), esc_html($this->template)));
+					$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				}
 				return;
 			}
 			// Set the parent. Pass the current instance so we can do the crazy checks above and assess errors.
-			$this->parent = new WP_Theme( $this->template, isset( $theme_root_template ) ? $theme_root_template : $this->theme_root, $this );
+			$this->parent = new WP_Theme($this->template, isset($theme_root_template) ? $theme_root_template : $this->theme_root, $this);
 		}
 
 		// We're good. If we didn't retrieve from cache, set it.
-		if ( ! is_array( $cache ) ) {
-			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
+		if ( ! is_array($cache)) {
+			$cache = array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template);
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
+			if (isset($theme_root_template))
 				$cache['theme_root_template'] = $theme_root_template;
-			$this->cache_add( 'theme', $cache );
+			$this->cache_add('theme', $cache);
 		}
 	}
 
@@ -346,13 +346,13 @@ 
 	 * @param string $offset Property to check if set.
 	 * @return bool Whether the given property is set.
 	 */
-	public function __isset( $offset ) {
+	public function __isset($offset) {
 		static $properties = array(
 			'name', 'title', 'version', 'parent_theme', 'template_dir', 'stylesheet_dir', 'template', 'stylesheet',
 			'screenshot', 'description', 'author', 'tags', 'theme_root', 'theme_root_uri',
 		);
 
-		return in_array( $offset, $properties );
+		return in_array($offset, $properties);
 	}
 
 	/**
@@ -361,8 +361,8 @@ 
 	 * @param string $offset Property to get.
 	 * @return mixed Property value.
 	 */
-	public function __get( $offset ) {
-		switch ( $offset ) {
+	public function __get($offset) {
+		switch ($offset) {
 			case 'name' :
 			case 'title' :
 				return $this->get('Name');
@@ -379,21 +379,21 @@ 
 			case 'stylesheet' :
 				return $this->get_stylesheet();
 			case 'screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			// 'author' and 'description' did not previously return translated data.
 			case 'description' :
 				return $this->display('Description');
 			case 'author' :
 				return $this->display('Author');
 			case 'tags' :
-				return $this->get( 'Tags' );
+				return $this->get('Tags');
 			case 'theme_root' :
 				return $this->get_theme_root();
 			case 'theme_root_uri' :
 				return $this->get_theme_root_uri();
 			// For cases where the array was converted to an object.
 			default :
-				return $this->offsetGet( $offset );
+				return $this->offsetGet($offset);
 		}
 	}
 
@@ -403,14 +403,14 @@ 
 	 * @param mixed $offset
 	 * @param mixed $value
 	 */
-	public function offsetSet( $offset, $value ) {}
+	public function offsetSet($offset, $value) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
 	 *
 	 * @param mixed $offset
 	 */
-	public function offsetUnset( $offset ) {}
+	public function offsetUnset($offset) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
@@ -420,14 +420,14 @@ 
 	 * @param mixed $offset
 	 * @return bool
 	 */
-	public function offsetExists( $offset ) {
+	public function offsetExists($offset) {
 		static $keys = array(
 			'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
 			'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',
 			'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
 		);
 
-		return in_array( $offset, $keys );
+		return in_array($offset, $keys);
 	}
 
 	/**
@@ -443,8 +443,8 @@ 
 	 * @param mixed $offset
 	 * @return mixed
 	 */
-	public function offsetGet( $offset ) {
-		switch ( $offset ) {
+	public function offsetGet($offset) {
+		switch ($offset) {
 			case 'Name' :
 			case 'Title' :
 				/*
@@ -453,30 +453,30 @@ 
 				 */
 				return $this->get('Name');
 			case 'Author' :
-				return $this->display( 'Author');
+				return $this->display('Author');
 			case 'Author Name' :
-				return $this->display( 'Author', false);
+				return $this->display('Author', false);
 			case 'Author URI' :
 				return $this->display('AuthorURI');
 			case 'Description' :
-				return $this->display( 'Description');
+				return $this->display('Description');
 			case 'Version' :
 			case 'Status' :
-				return $this->get( $offset );
+				return $this->get($offset);
 			case 'Template' :
 				return $this->get_template();
 			case 'Stylesheet' :
 				return $this->get_stylesheet();
 			case 'Template Files' :
-				return $this->get_files( 'php', 1, true );
+				return $this->get_files('php', 1, true);
 			case 'Stylesheet Files' :
-				return $this->get_files( 'css', 0, false );
+				return $this->get_files('css', 0, false);
 			case 'Template Dir' :
 				return $this->get_template_directory();
 			case 'Stylesheet Dir' :
 				return $this->get_stylesheet_directory();
 			case 'Screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			case 'Tags' :
 				return $this->get('Tags');
 			case 'Theme Root' :
@@ -499,7 +499,7 @@ 
 	 * @return WP_Error|false WP_Error if there are errors, or false.
 	 */
 	public function errors() {
-		return is_wp_error( $this->errors ) ? $this->errors : false;
+		return is_wp_error($this->errors) ? $this->errors : false;
 	}
 
 	/**
@@ -514,7 +514,7 @@ 
 	 * @return bool Whether the theme exists.
 	 */
 	public function exists() {
-		return ! ( $this->errors() && in_array( 'theme_not_found', $this->errors()->get_error_codes() ) );
+		return ! ($this->errors() && in_array('theme_not_found', $this->errors()->get_error_codes()));
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
 	 */
 	public function parent() {
-		return isset( $this->parent ) ? $this->parent : false;
+		return isset($this->parent) ? $this->parent : false;
 	}
 
 	/**
@@ -541,8 +541,8 @@ 
 	 * @param string $data Data to store
 	 * @return bool Return value from wp_cache_add()
 	 */
-	private function cache_add( $key, $data ) {
-		return wp_cache_add( $key . '-' . $this->cache_hash, $data, 'themes', self::$cache_expiration );
+	private function cache_add($key, $data) {
+		return wp_cache_add($key.'-'.$this->cache_hash, $data, 'themes', self::$cache_expiration);
 	}
 
 	/**
@@ -556,8 +556,8 @@ 
 	 * @param string $key Type of data to retrieve (theme, screenshot, headers, page_templates)
 	 * @return mixed Retrieved data
 	 */
-	private function cache_get( $key ) {
-		return wp_cache_get( $key . '-' . $this->cache_hash, 'themes' );
+	private function cache_get($key) {
+		return wp_cache_get($key.'-'.$this->cache_hash, 'themes');
 	}
 
 	/**
@@ -567,11 +567,11 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach (array('theme', 'screenshot', 'headers', 'page_templates') as $key)
+			wp_cache_delete($key.'-'.$this->cache_hash, 'themes');
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
-		$this->__construct( $this->stylesheet, $this->theme_root );
+		$this->__construct($this->stylesheet, $this->theme_root);
 	}
 
 	/**
@@ -591,29 +591,29 @@ 
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @return string|false String on success, false on failure.
 	 */
-	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
+	public function get($header) {
+		if ( ! isset($this->headers[$header]))
 			return false;
 
-		if ( ! isset( $this->headers_sanitized ) ) {
-			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
+		if ( ! isset($this->headers_sanitized)) {
+			$this->headers_sanitized = $this->cache_get('headers');
+			if ( ! is_array($this->headers_sanitized))
 				$this->headers_sanitized = array();
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if (isset($this->headers_sanitized[$header]))
+			return $this->headers_sanitized[$header];
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
-		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
-			$this->cache_add( 'headers', $this->headers_sanitized );
+		if (self::$persistently_cache) {
+			foreach (array_keys($this->headers) as $_header)
+				$this->headers_sanitized[$_header] = $this->sanitize_header($_header, $this->headers[$_header]);
+			$this->cache_add('headers', $this->headers_sanitized);
 		} else {
-			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
+			$this->headers_sanitized[$header] = $this->sanitize_header($header, $this->headers[$header]);
 		}
 
-		return $this->headers_sanitized[ $header ];
+		return $this->headers_sanitized[$header];
 	}
 
 	/**
@@ -627,20 +627,20 @@ 
 	 * @param bool $translate Optional. Whether to translate the header. Defaults to true.
 	 * @return string|false Processed header, false on failure.
 	 */
-	public function display( $header, $markup = true, $translate = true ) {
-		$value = $this->get( $header );
-		if ( false === $value ) {
+	public function display($header, $markup = true, $translate = true) {
+		$value = $this->get($header);
+		if (false === $value) {
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
+		if ($translate && (empty($value) || ! $this->load_textdomain()))
 			$translate = false;
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ($translate)
+			$value = $this->translate_header($header, $value);
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ($markup)
+			$value = $this->markup_header($header, $value, $translate);
 
 		return $value;
 	}
@@ -658,46 +658,46 @@ 
 	 * @param string $value Value to sanitize.
 	 * @return mixed
 	 */
-	private function sanitize_header( $header, $value ) {
-		switch ( $header ) {
+	private function sanitize_header($header, $value) {
+		switch ($header) {
 			case 'Status' :
-				if ( ! $value ) {
+				if ( ! $value) {
 					$value = 'publish';
 					break;
 				}
 				// Fall through otherwise.
 			case 'Name' :
 				static $header_tags = array(
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags );
+				$value = wp_kses($value, $header_tags);
 				break;
 			case 'Author' :
 				// There shouldn't be anchor tags in Author, but some themes like to be challenging.
 			case 'Description' :
 				static $header_tags_with_a = array(
-					'a'       => array( 'href' => true, 'title' => true ),
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'a'       => array('href' => true, 'title' => true),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags_with_a );
+				$value = wp_kses($value, $header_tags_with_a);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url_raw( $value );
+				$value = esc_url_raw($value);
 				break;
 			case 'Tags' :
-				$value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
+				$value = array_filter(array_map('trim', explode(',', strip_tags($value))));
 				break;
 			case 'Version' :
-				$value = strip_tags( $value );
+				$value = strip_tags($value);
 				break;
 		}
 
@@ -717,33 +717,33 @@ 
 	 * @param string $translate Whether the header has been translated.
 	 * @return string Value, marked up.
 	 */
-	private function markup_header( $header, $value, $translate ) {
-		switch ( $header ) {
+	private function markup_header($header, $value, $translate) {
+		switch ($header) {
 			case 'Name' :
-				if ( empty( $value ) )
+				if (empty($value))
 					$value = $this->get_stylesheet();
 				break;
 			case 'Description' :
-				$value = wptexturize( $value );
+				$value = wptexturize($value);
 				break;
 			case 'Author' :
-				if ( $this->get('AuthorURI') ) {
-					$value = sprintf( '<a href="%1$s">%2$s</a>', $this->display( 'AuthorURI', true, $translate ), $value );
-				} elseif ( ! $value ) {
-					$value = __( 'Anonymous' );
+				if ($this->get('AuthorURI')) {
+					$value = sprintf('<a href="%1$s">%2$s</a>', $this->display('AuthorURI', true, $translate), $value);
+				} elseif ( ! $value) {
+					$value = __('Anonymous');
 				}
 				break;
 			case 'Tags' :
 				static $comma = null;
-				if ( ! isset( $comma ) ) {
+				if ( ! isset($comma)) {
 					/* translators: used between list items, there is a space after the comma */
-					$comma = __( ', ' );
+					$comma = __(', ');
 				}
-				$value = implode( $comma, $value );
+				$value = implode($comma, $value);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url( $value );
+				$value = esc_url($value);
 				break;
 		}
 
@@ -762,51 +762,51 @@ 
 	 * @param string $value Value to translate.
 	 * @return string Translated value.
 	 */
-	private function translate_header( $header, $value ) {
-		switch ( $header ) {
+	private function translate_header($header, $value) {
+		switch ($header) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
+				if (isset($this->name_translated))
 					return $this->name_translated;
-				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
+				$this->name_translated = translate($value, $this->get('TextDomain'));
 				return $this->name_translated;
 			case 'Tags' :
-				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) ) {
+				if (empty($value) || ! function_exists('get_theme_feature_list')) {
 					return $value;
 				}
 
 				static $tags_list;
-				if ( ! isset( $tags_list ) ) {
+				if ( ! isset($tags_list)) {
 					$tags_list = array(
 						// As of 4.6, deprecated tags which are only used to provide translation for older themes.
-						'black' => __( 'Black' ), 'blue' => __( 'Blue' ), 'brown'  => __( 'Brown' ),
-						'gray' => __( 'Gray' ), 'green'  => __( 'Green' ), 'orange' => __( 'Orange' ),
-						'pink' => __( 'Pink' ), 'purple' => __( 'Purple' ), 'red' => __( 'Red' ),
-						'silver' => __( 'Silver' ), 'tan' => __( 'Tan' ), 'white' => __( 'White' ),
-						'yellow' => __( 'Yellow' ), 'dark' => __( 'Dark' ), 'light' => __( 'Light' ),
-						'fixed-layout' => __( 'Fixed Layout' ), 'fluid-layout' => __( 'Fluid Layout' ),
-						'responsive-layout' => __( 'Responsive Layout' ), 'blavatar' => __( 'Blavatar' ),
-						'photoblogging' => __( 'Photoblogging' ), 'seasonal' => __( 'Seasonal' ),
+						'black' => __('Black'), 'blue' => __('Blue'), 'brown'  => __('Brown'),
+						'gray' => __('Gray'), 'green'  => __('Green'), 'orange' => __('Orange'),
+						'pink' => __('Pink'), 'purple' => __('Purple'), 'red' => __('Red'),
+						'silver' => __('Silver'), 'tan' => __('Tan'), 'white' => __('White'),
+						'yellow' => __('Yellow'), 'dark' => __('Dark'), 'light' => __('Light'),
+						'fixed-layout' => __('Fixed Layout'), 'fluid-layout' => __('Fluid Layout'),
+						'responsive-layout' => __('Responsive Layout'), 'blavatar' => __('Blavatar'),
+						'photoblogging' => __('Photoblogging'), 'seasonal' => __('Seasonal'),
 					);
 
-					$feature_list = get_theme_feature_list( false ); // No API
-					foreach ( $feature_list as $tags ) {
+					$feature_list = get_theme_feature_list(false); // No API
+					foreach ($feature_list as $tags) {
 						$tags_list += $tags;
 					}
 				}
 
-				foreach ( $value as &$tag ) {
-					if ( isset( $tags_list[ $tag ] ) ) {
-						$tag = $tags_list[ $tag ];
-					} elseif ( isset( self::$tag_map[ $tag ] ) ) {
-						$tag = $tags_list[ self::$tag_map[ $tag ] ];
+				foreach ($value as &$tag) {
+					if (isset($tags_list[$tag])) {
+						$tag = $tags_list[$tag];
+					} elseif (isset(self::$tag_map[$tag])) {
+						$tag = $tags_list[self::$tag_map[$tag]];
 					}
 				}
 
 				return $value;
 
 			default :
-				$value = translate( $value, $this->get('TextDomain') );
+				$value = translate($value, $this->get('TextDomain'));
 		}
 		return $value;
 	}
@@ -853,10 +853,10 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
+		if ($this->errors() && in_array('theme_root_missing', $this->errors()->get_error_codes()))
 			return '';
 
-		return $this->theme_root . '/' . $this->stylesheet;
+		return $this->theme_root.'/'.$this->stylesheet;
 	}
 
 	/**
@@ -871,12 +871,12 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root = $this->parent()->theme_root;
 		else
 			$theme_root = $this->theme_root;
 
-		return $theme_root . '/' . $this->template;
+		return $theme_root.'/'.$this->template;
 	}
 
 	/**
@@ -891,7 +891,7 @@ 
 	 * @return string URL to the stylesheet directory.
 	 */
 	public function get_stylesheet_directory_uri() {
-		return $this->get_theme_root_uri() . '/' . str_replace( '%2F', '/', rawurlencode( $this->stylesheet ) );
+		return $this->get_theme_root_uri().'/'.str_replace('%2F', '/', rawurlencode($this->stylesheet));
 	}
 
 	/**
@@ -906,12 +906,12 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root_uri = $this->parent()->get_theme_root_uri();
 		else
 			$theme_root_uri = $this->get_theme_root_uri();
 
-		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
+		return $theme_root_uri.'/'.str_replace('%2F', '/', rawurlencode($this->template));
 	}
 
 	/**
@@ -941,8 +941,8 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset($this->theme_root_uri))
+			$this->theme_root_uri = get_theme_root_uri($this->stylesheet, $this->theme_root);
 		return $this->theme_root_uri;
 	}
 
@@ -960,26 +960,26 @@ 
 	 * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
 	 * @return string|false Screenshot file. False if the theme does not have a screenshot.
 	 */
-	public function get_screenshot( $uri = 'uri' ) {
-		$screenshot = $this->cache_get( 'screenshot' );
-		if ( $screenshot ) {
-			if ( 'relative' == $uri )
+	public function get_screenshot($uri = 'uri') {
+		$screenshot = $this->cache_get('screenshot');
+		if ($screenshot) {
+			if ('relative' == $uri)
 				return $screenshot;
-			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
-		} elseif ( 0 === $screenshot ) {
+			return $this->get_stylesheet_directory_uri().'/'.$screenshot;
+		} elseif (0 === $screenshot) {
 			return false;
 		}
 
-		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
-			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
-				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
-				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
+		foreach (array('png', 'gif', 'jpg', 'jpeg') as $ext) {
+			if (file_exists($this->get_stylesheet_directory()."/screenshot.$ext")) {
+				$this->cache_add('screenshot', 'screenshot.'.$ext);
+				if ('relative' == $uri)
+					return 'screenshot.'.$ext;
+				return $this->get_stylesheet_directory_uri().'/'.'screenshot.'.$ext;
 			}
 		}
 
-		$this->cache_add( 'screenshot', 0 );
+		$this->cache_add('screenshot', 0);
 		return false;
 	}
 
@@ -995,11 +995,11 @@ 
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
 	 * 	             being absolute paths.
 	 */
-	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
-		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
+	public function get_files($type = null, $depth = 0, $search_parent = false) {
+		$files = (array) self::scandir($this->get_stylesheet_directory(), $type, $depth);
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ($search_parent && $this->parent())
+			$files += (array) self::scandir($this->get_template_directory(), $type, $depth);
 
 		return $files;
 	}
@@ -1013,35 +1013,35 @@ 
 	 * @param WP_Post|null $post Optional. The post being edited, provided for context.
 	 * @return array Array of page templates, keyed by filename, with the value of the translated header name.
 	 */
-	public function get_page_templates( $post = null ) {
+	public function get_page_templates($post = null) {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
+		if ($this->errors() && $this->errors()->get_error_codes() !== array('theme_parent_invalid'))
 			return array();
 
-		$page_templates = $this->cache_get( 'page_templates' );
+		$page_templates = $this->cache_get('page_templates');
 
-		if ( ! is_array( $page_templates ) ) {
+		if ( ! is_array($page_templates)) {
 			$page_templates = array();
 
-			$files = (array) $this->get_files( 'php', 1 );
+			$files = (array) $this->get_files('php', 1);
 
-			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
+			foreach ($files as $file => $full_path) {
+				if ( ! preg_match('|Template Name:(.*)$|mi', file_get_contents($full_path), $header))
 					continue;
-				$page_templates[ $file ] = _cleanup_header_comment( $header[1] );
+				$page_templates[$file] = _cleanup_header_comment($header[1]);
 			}
 
-			$this->cache_add( 'page_templates', $page_templates );
+			$this->cache_add('page_templates', $page_templates);
 		}
 
-		if ( $this->load_textdomain() ) {
-			foreach ( $page_templates as &$page_template ) {
-				$page_template = $this->translate_header( 'Template Name', $page_template );
+		if ($this->load_textdomain()) {
+			foreach ($page_templates as &$page_template) {
+				$page_template = $this->translate_header('Template Name', $page_template);
 			}
 		}
 
-		if ( $this->parent() )
-			$page_templates += $this->parent()->get_page_templates( $post );
+		if ($this->parent())
+			$page_templates += $this->parent()->get_page_templates($post);
 
 		/**
 		 * Filters list of page templates for a theme.
@@ -1054,7 +1054,7 @@ 
 		 * @param WP_Theme     $this           The theme object.
 		 * @param WP_Post|null $post           The post being edited, provided for context, or null.
 		 */
-		return (array) apply_filters( 'theme_page_templates', $page_templates, $this, $post );
+		return (array) apply_filters('theme_page_templates', $page_templates, $this, $post);
 	}
 
 	/**
@@ -1076,32 +1076,32 @@ 
 	 * @return array|false Array of files, keyed by the path to the file relative to the `$path` directory prepended
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
-	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
+	private static function scandir($path, $extensions = null, $depth = 0, $relative_path = '') {
+		if ( ! is_dir($path))
 			return false;
 
-		if ( $extensions ) {
+		if ($extensions) {
 			$extensions = (array) $extensions;
-			$_extensions = implode( '|', $extensions );
+			$_extensions = implode('|', $extensions);
 		}
 
-		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
+		$relative_path = trailingslashit($relative_path);
+		if ('/' == $relative_path)
 			$relative_path = '';
 
-		$results = scandir( $path );
+		$results = scandir($path);
 		$files = array();
 
-		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
+		foreach ($results as $result) {
+			if ('.' == $result[0])
 				continue;
-			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
+			if (is_dir($path.'/'.$result)) {
+				if ( ! $depth || 'CVS' == $result)
 					continue;
-				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
-				$files = array_merge_recursive( $files, $found );
-			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
-				$files[ $relative_path . $result ] = $path . '/' . $result;
+				$found = self::scandir($path.'/'.$result, $extensions, $depth - 1, $relative_path.$result);
+				$files = array_merge_recursive($files, $found);
+			} elseif ( ! $extensions || preg_match('~\.('.$_extensions.')$~', $result)) {
+				$files[$relative_path.$result] = $path.'/'.$result;
 			}
 		}
 
@@ -1121,27 +1121,27 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
+		if (isset($this->textdomain_loaded))
 			return $this->textdomain_loaded;
 
 		$textdomain = $this->get('TextDomain');
-		if ( ! $textdomain ) {
+		if ( ! $textdomain) {
 			$this->textdomain_loaded = false;
 			return false;
 		}
 
-		if ( is_textdomain_loaded( $textdomain ) ) {
+		if (is_textdomain_loaded($textdomain)) {
 			$this->textdomain_loaded = true;
 			return true;
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
+		if ($domainpath = $this->get('DomainPath'))
 			$path .= $domainpath;
 		else
 			$path .= '/languages';
 
-		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
+		$this->textdomain_loaded = load_theme_textdomain($textdomain, $path);
 		return $this->textdomain_loaded;
 	}
 
@@ -1156,19 +1156,19 @@ 
 	 * @param int $blog_id Optional. Ignored if only network-wide settings are checked. Defaults to current site.
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
-	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
+	public function is_allowed($check = 'both', $blog_id = null) {
+		if ( ! is_multisite())
 			return true;
 
-		if ( 'both' == $check || 'network' == $check ) {
+		if ('both' == $check || 'network' == $check) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
-		if ( 'both' == $check || 'site' == $check ) {
-			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+		if ('both' == $check || 'site' == $check) {
+			$allowed = self::get_allowed_on_site($blog_id);
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
@@ -1183,9 +1183,9 @@ 
 	 * @return WP_Theme|false Object, or false if no theme is installed, which would be bad.
 	 */
 	public static function get_core_default_theme() {
-		foreach ( array_reverse( self::$default_themes ) as $slug => $name ) {
-			$theme = wp_get_theme( $slug );
-			if ( $theme->exists() ) {
+		foreach (array_reverse(self::$default_themes) as $slug => $name) {
+			$theme = wp_get_theme($slug);
+			if ($theme->exists()) {
 				return $theme;
 			}
 		}
@@ -1203,7 +1203,7 @@ 
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed( $blog_id = null ) {
+	public static function get_allowed($blog_id = null) {
 		/**
 		 * Filters the array of themes allowed on the network.
 		 *
@@ -1215,8 +1215,8 @@ 
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 * @param int   $blog_id        ID of the site.
 		 */
-		$network = (array) apply_filters( 'network_allowed_themes', self::get_allowed_on_network(), $blog_id );
-		return $network + self::get_allowed_on_site( $blog_id );
+		$network = (array) apply_filters('network_allowed_themes', self::get_allowed_on_network(), $blog_id);
+		return $network + self::get_allowed_on_site($blog_id);
 	}
 
 	/**
@@ -1233,8 +1233,8 @@ 
 	 */
 	public static function get_allowed_on_network() {
 		static $allowed_themes;
-		if ( ! isset( $allowed_themes ) ) {
-			$allowed_themes = (array) get_site_option( 'allowedthemes' );
+		if ( ! isset($allowed_themes)) {
+			$allowed_themes = (array) get_site_option('allowedthemes');
 		}
 
 		/**
@@ -1244,7 +1244,7 @@ 
 		 *
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 */
-		$allowed_themes = apply_filters( 'allowed_themes', $allowed_themes );
+		$allowed_themes = apply_filters('allowed_themes', $allowed_themes);
 
 		return $allowed_themes;
 	}
@@ -1262,13 +1262,13 @@ 
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed_on_site( $blog_id = null ) {
+	public static function get_allowed_on_site($blog_id = null) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
+		if ( ! $blog_id || ! is_multisite())
 			$blog_id = get_current_blog_id();
 
-		if ( isset( $allowed_themes[ $blog_id ] ) ) {
+		if (isset($allowed_themes[$blog_id])) {
 			/**
 			 * Filters the array of themes allowed on the site.
 			 *
@@ -1277,57 +1277,57 @@ 
 			 * @param array $allowed_themes An array of theme stylesheet names.
 			 * @param int   $blog_id        ID of the site. Defaults to current site.
 			 */
-			return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
+			return (array) apply_filters('site_allowed_themes', $allowed_themes[$blog_id], $blog_id);
 		}
 
 		$current = $blog_id == get_current_blog_id();
 
-		if ( $current ) {
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+		if ($current) {
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 		} else {
-			switch_to_blog( $blog_id );
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+			switch_to_blog($blog_id);
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 			restore_current_blog();
 		}
 
 		// This is all super old MU back compat joy.
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		if ( false === $allowed_themes[ $blog_id ] ) {
-			if ( $current ) {
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+		if (false === $allowed_themes[$blog_id]) {
+			if ($current) {
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 			} else {
-				switch_to_blog( $blog_id );
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+				switch_to_blog($blog_id);
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 				restore_current_blog();
 			}
 
-			if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
-				$allowed_themes[ $blog_id ] = array();
+			if ( ! is_array($allowed_themes[$blog_id]) || empty($allowed_themes[$blog_id])) {
+				$allowed_themes[$blog_id] = array();
 			} else {
 				$converted = array();
 				$themes = wp_get_themes();
-				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+				foreach ($themes as $stylesheet => $theme_data) {
+					if (isset($allowed_themes[$blog_id][$theme_data->get('Name')]))
+						$converted[$stylesheet] = true;
 				}
-				$allowed_themes[ $blog_id ] = $converted;
+				$allowed_themes[$blog_id] = $converted;
 			}
 			// Set the option so we never have to go through this pain again.
-			if ( is_admin() && $allowed_themes[ $blog_id ] ) {
-				if ( $current ) {
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+			if (is_admin() && $allowed_themes[$blog_id]) {
+				if ($current) {
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 				} else {
-					switch_to_blog( $blog_id );
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+					switch_to_blog($blog_id);
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 					restore_current_blog();
 				}
 			}
 		}
 
 		/** This filter is documented in wp-includes/class-wp-theme.php */
-		return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
+		return (array) apply_filters('site_allowed_themes', $allowed_themes[$blog_id], $blog_id);
 	}
 
 	/**
@@ -1339,21 +1339,21 @@ 
 	 *
 	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
 	 */
-	public static function network_enable_theme( $stylesheets ) {
-		if ( ! is_multisite() ) {
+	public static function network_enable_theme($stylesheets) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( ! is_array( $stylesheets ) ) {
-			$stylesheets = array( $stylesheets );
+		if ( ! is_array($stylesheets)) {
+			$stylesheets = array($stylesheets);
 		}
 
-		$allowed_themes = get_site_option( 'allowedthemes' );
-		foreach ( $stylesheets as $stylesheet ) {
-			$allowed_themes[ $stylesheet ] = true;
+		$allowed_themes = get_site_option('allowedthemes');
+		foreach ($stylesheets as $stylesheet) {
+			$allowed_themes[$stylesheet] = true;
 		}
 
-		update_site_option( 'allowedthemes', $allowed_themes );
+		update_site_option('allowedthemes', $allowed_themes);
 	}
 
 	/**
@@ -1365,23 +1365,23 @@ 
 	 *
 	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
 	 */
-	public static function network_disable_theme( $stylesheets ) {
-		if ( ! is_multisite() ) {
+	public static function network_disable_theme($stylesheets) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( ! is_array( $stylesheets ) ) {
-			$stylesheets = array( $stylesheets );
+		if ( ! is_array($stylesheets)) {
+			$stylesheets = array($stylesheets);
 		}
 
-		$allowed_themes = get_site_option( 'allowedthemes' );
-		foreach ( $stylesheets as $stylesheet ) {
-			if ( isset( $allowed_themes[ $stylesheet ] ) ) {
-				unset( $allowed_themes[ $stylesheet ] );
+		$allowed_themes = get_site_option('allowedthemes');
+		foreach ($stylesheets as $stylesheet) {
+			if (isset($allowed_themes[$stylesheet])) {
+				unset($allowed_themes[$stylesheet]);
 			}
 		}
 
-		update_site_option( 'allowedthemes', $allowed_themes );
+		update_site_option('allowedthemes', $allowed_themes);
 	}
 
 	/**
@@ -1394,11 +1394,11 @@ 
 	 *
 	 * @param array $themes Array of themes to sort, passed by reference.
 	 */
-	public static function sort_by_name( &$themes ) {
-		if ( 0 === strpos( get_locale(), 'en_' ) ) {
-			uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
+	public static function sort_by_name(&$themes) {
+		if (0 === strpos(get_locale(), 'en_')) {
+			uasort($themes, array('WP_Theme', '_name_sort'));
 		} else {
-			uasort( $themes, array( 'WP_Theme', '_name_sort_i18n' ) );
+			uasort($themes, array('WP_Theme', '_name_sort_i18n'));
 		}
 	}
 
@@ -1418,8 +1418,8 @@ 
 	 * @return int Negative if `$a` falls lower in the natural order than `$b`. Zero if they fall equally.
 	 *             Greater than 0 if `$a` falls higher in the natural order than `$b`. Used with usort().
 	 */
-	private static function _name_sort( $a, $b ) {
-		return strnatcasecmp( $a->headers['Name'], $b->headers['Name'] );
+	private static function _name_sort($a, $b) {
+		return strnatcasecmp($a->headers['Name'], $b->headers['Name']);
 	}
 
 	/**
@@ -1435,8 +1435,8 @@ 
 	 * @return int Negative if `$a` falls lower in the natural order than `$b`. Zero if they fall equally.
 	 *             Greater than 0 if `$a` falls higher in the natural order than `$b`. Used with usort().
 	 */
-	private static function _name_sort_i18n( $a, $b ) {
+	private static function _name_sort_i18n($a, $b) {
 		// Don't mark up; Do translate.
-		return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
+		return strnatcasecmp($a->display('Name', false, true), $b->display('Name', false, true));
 	}
 }

Braces +125 added lines, -85 removed lines

@@ -207,8 +207,9 @@ 
 			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
 			if ( self::$persistently_cache ) {
 				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
-					self::$cache_expiration = self::$persistently_cache;
+				if ( is_int( self::$persistently_cache ) ) {
+									self::$cache_expiration = self::$persistently_cache;
+				}
 			} else {
 				wp_cache_add_non_persistent_groups( 'themes' );
 			}
@@ -230,23 +231,29 @@ 
 
 		if ( is_array( $cache ) ) {
 			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+				if ( isset( $cache[ $key ] ) ) {
+									$this->$key = $cache[ $key ];
+				}
+			}
+			if ( $this->errors ) {
+							return;
+			}
+			if ( isset( $cache['theme_root_template'] ) ) {
+							$theme_root_template = $cache['theme_root_template'];
 			}
-			if ( $this->errors )
-				return;
-			if ( isset( $cache['theme_root_template'] ) )
-				$theme_root_template = $cache['theme_root_template'];
 		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
-			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) ) {
+							$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
+			} else {
+							$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			}
 			$this->template = $this->stylesheet;
 			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
+			if ( ! file_exists( $this->theme_root ) ) {
+				// Don't cache this one.
 				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			}
 			return;
 		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
@@ -259,8 +266,9 @@ 
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
 			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+				if ( basename( $this->stylesheet ) != $default_theme_slug ) {
+									$this->headers['Name'] .= '/' . $this->stylesheet;
+				}
 			}
 		}
 
@@ -323,8 +331,9 @@ 
 		if ( ! is_array( $cache ) ) {
 			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
-				$cache['theme_root_template'] = $theme_root_template;
+			if ( isset( $theme_root_template ) ) {
+							$cache['theme_root_template'] = $theme_root_template;
+			}
 			$this->cache_add( 'theme', $cache );
 		}
 	}
@@ -567,8 +576,9 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key ) {
+					wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		}
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
 		$this->__construct( $this->stylesheet, $this->theme_root );
@@ -592,22 +602,26 @@ 
 	 * @return string|false String on success, false on failure.
 	 */
 	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
-			return false;
+		if ( ! isset( $this->headers[ $header ] ) ) {
+					return false;
+		}
 
 		if ( ! isset( $this->headers_sanitized ) ) {
 			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
-				$this->headers_sanitized = array();
+			if ( ! is_array( $this->headers_sanitized ) ) {
+							$this->headers_sanitized = array();
+			}
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if ( isset( $this->headers_sanitized[ $header ] ) ) {
+					return $this->headers_sanitized[ $header ];
+		}
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
 		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			foreach ( array_keys( $this->headers ) as $_header ) {
+							$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			}
 			$this->cache_add( 'headers', $this->headers_sanitized );
 		} else {
 			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
@@ -633,14 +647,17 @@ 
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
-			$translate = false;
+		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) ) {
+					$translate = false;
+		}
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ( $translate ) {
+					$value = $this->translate_header( $header, $value );
+		}
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ( $markup ) {
+					$value = $this->markup_header( $header, $value, $translate );
+		}
 
 		return $value;
 	}
@@ -720,8 +737,9 @@ 
 	private function markup_header( $header, $value, $translate ) {
 		switch ( $header ) {
 			case 'Name' :
-				if ( empty( $value ) )
-					$value = $this->get_stylesheet();
+				if ( empty( $value ) ) {
+									$value = $this->get_stylesheet();
+				}
 				break;
 			case 'Description' :
 				$value = wptexturize( $value );
@@ -766,8 +784,9 @@ 
 		switch ( $header ) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
-					return $this->name_translated;
+				if ( isset( $this->name_translated ) ) {
+									return $this->name_translated;
+				}
 				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
 				return $this->name_translated;
 			case 'Tags' :
@@ -853,8 +872,9 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
-			return '';
+		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) ) {
+					return '';
+		}
 
 		return $this->theme_root . '/' . $this->stylesheet;
 	}
@@ -871,10 +891,11 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
-			$theme_root = $this->parent()->theme_root;
-		else
-			$theme_root = $this->theme_root;
+		if ( $this->parent() ) {
+					$theme_root = $this->parent()->theme_root;
+		} else {
+					$theme_root = $this->theme_root;
+		}
 
 		return $theme_root . '/' . $this->template;
 	}
@@ -906,10 +927,11 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
-			$theme_root_uri = $this->parent()->get_theme_root_uri();
-		else
-			$theme_root_uri = $this->get_theme_root_uri();
+		if ( $this->parent() ) {
+					$theme_root_uri = $this->parent()->get_theme_root_uri();
+		} else {
+					$theme_root_uri = $this->get_theme_root_uri();
+		}
 
 		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
 	}
@@ -941,8 +963,9 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset( $this->theme_root_uri ) ) {
+					$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		}
 		return $this->theme_root_uri;
 	}
 
@@ -963,8 +986,9 @@ 
 	public function get_screenshot( $uri = 'uri' ) {
 		$screenshot = $this->cache_get( 'screenshot' );
 		if ( $screenshot ) {
-			if ( 'relative' == $uri )
-				return $screenshot;
+			if ( 'relative' == $uri ) {
+							return $screenshot;
+			}
 			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
 		} elseif ( 0 === $screenshot ) {
 			return false;
@@ -973,8 +997,9 @@ 
 		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
 			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
 				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
+				if ( 'relative' == $uri ) {
+									return 'screenshot.' . $ext;
+				}
 				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
 			}
 		}
@@ -998,8 +1023,9 @@ 
 	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
 		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ( $search_parent && $this->parent() ) {
+					$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		}
 
 		return $files;
 	}
@@ -1015,8 +1041,9 @@ 
 	 */
 	public function get_page_templates( $post = null ) {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
-			return array();
+		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) {
+					return array();
+		}
 
 		$page_templates = $this->cache_get( 'page_templates' );
 
@@ -1026,8 +1053,9 @@ 
 			$files = (array) $this->get_files( 'php', 1 );
 
 			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
-					continue;
+				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) ) {
+									continue;
+				}
 				$page_templates[ $file ] = _cleanup_header_comment( $header[1] );
 			}
 
@@ -1040,8 +1068,9 @@ 
 			}
 		}
 
-		if ( $this->parent() )
-			$page_templates += $this->parent()->get_page_templates( $post );
+		if ( $this->parent() ) {
+					$page_templates += $this->parent()->get_page_templates( $post );
+		}
 
 		/**
 		 * Filters list of page templates for a theme.
@@ -1077,8 +1106,9 @@ 
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
 	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
-			return false;
+		if ( ! is_dir( $path ) ) {
+					return false;
+		}
 
 		if ( $extensions ) {
 			$extensions = (array) $extensions;
@@ -1086,18 +1116,21 @@ 
 		}
 
 		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
-			$relative_path = '';
+		if ( '/' == $relative_path ) {
+					$relative_path = '';
+		}
 
 		$results = scandir( $path );
 		$files = array();
 
 		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
-				continue;
+			if ( '.' == $result[0] ) {
+							continue;
+			}
 			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
-					continue;
+				if ( ! $depth || 'CVS' == $result ) {
+									continue;
+				}
 				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
 				$files = array_merge_recursive( $files, $found );
 			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
@@ -1121,8 +1154,9 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
-			return $this->textdomain_loaded;
+		if ( isset( $this->textdomain_loaded ) ) {
+					return $this->textdomain_loaded;
+		}
 
 		$textdomain = $this->get('TextDomain');
 		if ( ! $textdomain ) {
@@ -1136,10 +1170,11 @@ 
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
-			$path .= $domainpath;
-		else
-			$path .= '/languages';
+		if ( $domainpath = $this->get('DomainPath') ) {
+					$path .= $domainpath;
+		} else {
+					$path .= '/languages';
+		}
 
 		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
 		return $this->textdomain_loaded;
@@ -1157,19 +1192,22 @@ 
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
 	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
-			return true;
+		if ( ! is_multisite() ) {
+					return true;
+		}
 
 		if ( 'both' == $check || 'network' == $check ) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		if ( 'both' == $check || 'site' == $check ) {
 			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		return false;
@@ -1265,8 +1303,9 @@ 
 	public static function get_allowed_on_site( $blog_id = null ) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
-			$blog_id = get_current_blog_id();
+		if ( ! $blog_id || ! is_multisite() ) {
+					$blog_id = get_current_blog_id();
+		}
 
 		if ( isset( $allowed_themes[ $blog_id ] ) ) {
 			/**
@@ -1307,8 +1346,9 @@ 
 				$converted = array();
 				$themes = wp_get_themes();
 				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) ) {
+											$converted[ $stylesheet ] = true;
+					}
 				}
 				$allowed_themes[ $blog_id ] = $converted;
 			}

src/wp-includes/post-template.php

Spacing +415 added lines, -415 removed lines

@@ -26,7 +26,7 @@ 
  */
 function get_the_ID() {
 	$post = get_post();
-	return ! empty( $post ) ? $post->ID : false;
+	return ! empty($post) ? $post->ID : false;
 }
 
 /**
@@ -39,15 +39,15 @@ 
  * @param bool   $echo   Optional, default to true.Whether to display or return.
  * @return string|void String if $echo parameter is false.
  */
-function the_title( $before = '', $after = '', $echo = true ) {
+function the_title($before = '', $after = '', $echo = true) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
+	if (strlen($title) == 0)
 		return;
 
-	$title = $before . $title . $after;
+	$title = $before.$title.$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $title;
 	else
 		return $title;
@@ -75,20 +75,20 @@ 
  * }
  * @return string|void String when echo is false.
  */
-function the_title_attribute( $args = '' ) {
-	$defaults = array( 'before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
-	$r = wp_parse_args( $args, $defaults );
+function the_title_attribute($args = '') {
+	$defaults = array('before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post());
+	$r = wp_parse_args($args, $defaults);
 
-	$title = get_the_title( $r['post'] );
+	$title = get_the_title($r['post']);
 
-	if ( strlen( $title ) == 0 ) {
+	if (strlen($title) == 0) {
 		return;
 	}
 
-	$title = $r['before'] . $title . $r['after'];
-	$title = esc_attr( strip_tags( $title ) );
+	$title = $r['before'].$title.$r['after'];
+	$title = esc_attr(strip_tags($title));
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $title;
 	} else {
 		return $title;
@@ -107,14 +107,14 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string
  */
-function get_the_title( $post = 0 ) {
-	$post = get_post( $post );
+function get_the_title($post = 0) {
+	$post = get_post($post);
 
-	$title = isset( $post->post_title ) ? $post->post_title : '';
-	$id = isset( $post->ID ) ? $post->ID : 0;
+	$title = isset($post->post_title) ? $post->post_title : '';
+	$id = isset($post->ID) ? $post->ID : 0;
 
-	if ( ! is_admin() ) {
-		if ( ! empty( $post->post_password ) ) {
+	if ( ! is_admin()) {
+		if ( ! empty($post->post_password)) {
 
 			/**
 			 * Filters the text prepended to the post title for protected posts.
@@ -127,9 +127,9 @@ 
 			 *                         Default 'Protected: %s'.
 			 * @param WP_Post $post    Current post object.
 			 */
-			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
-			$title = sprintf( $protected_title_format, $title );
-		} elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
+			$protected_title_format = apply_filters('protected_title_format', __('Protected: %s'), $post);
+			$title = sprintf($protected_title_format, $title);
+		} elseif (isset($post->post_status) && 'private' == $post->post_status) {
 
 			/**
 			 * Filters the text prepended to the post title of private posts.
@@ -142,8 +142,8 @@ 
 			 *                         Default 'Private: %s'.
 			 * @param WP_Post $post    Current post object.
 			 */
-			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post );
-			$title = sprintf( $private_title_format, $title );
+			$private_title_format = apply_filters('private_title_format', __('Private: %s'), $post);
+			$title = sprintf($private_title_format, $title);
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 	 * @param string $title The post title.
 	 * @param int    $id    The post ID.
 	 */
-	return apply_filters( 'the_title', $title, $id );
+	return apply_filters('the_title', $title, $id);
 }
 
 /**
@@ -171,11 +171,11 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  */
-function the_guid( $post = 0 ) {
-	$post = get_post( $post );
+function the_guid($post = 0) {
+	$post = get_post($post);
 
-	$guid = isset( $post->guid ) ? get_the_guid( $post ) : '';
-	$id   = isset( $post->ID ) ? $post->ID : 0;
+	$guid = isset($post->guid) ? get_the_guid($post) : '';
+	$id   = isset($post->ID) ? $post->ID : 0;
 
 	/**
 	 * Filters the escaped Global Unique Identifier (guid) of the post.
@@ -187,7 +187,7 @@ 
 	 * @param string $guid Escaped Global Unique Identifier (guid) of the post.
 	 * @param int    $id   The post ID.
 	 */
-	echo apply_filters( 'the_guid', $guid, $id );
+	echo apply_filters('the_guid', $guid, $id);
 }
 
 /**
@@ -202,11 +202,11 @@ 
  * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  * @return string
  */
-function get_the_guid( $post = 0 ) {
-	$post = get_post( $post );
+function get_the_guid($post = 0) {
+	$post = get_post($post);
 
-	$guid = isset( $post->guid ) ? $post->guid : '';
-	$id   = isset( $post->ID ) ? $post->ID : 0;
+	$guid = isset($post->guid) ? $post->guid : '';
+	$id   = isset($post->ID) ? $post->ID : 0;
 
 	/**
 	 * Filters the Global Unique Identifier (guid) of the post.
@@ -216,7 +216,7 @@ 
 	 * @param string $guid Global Unique Identifier (guid) of the post.
 	 * @param int    $id   The post ID.
 	 */
-	return apply_filters( 'get_the_guid', $guid, $id );
+	return apply_filters('get_the_guid', $guid, $id);
 }
 
 /**
@@ -227,8 +227,8 @@ 
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  */
-function the_content( $more_link_text = null, $strip_teaser = false) {
-	$content = get_the_content( $more_link_text, $strip_teaser );
+function the_content($more_link_text = null, $strip_teaser = false) {
+	$content = get_the_content($more_link_text, $strip_teaser);
 
 	/**
 	 * Filters the post content.
@@ -237,8 +237,8 @@ 
 	 *
 	 * @param string $content Content of the current post.
 	 */
-	$content = apply_filters( 'the_content', $content );
-	$content = str_replace( ']]>', ']]>', $content );
+	$content = apply_filters('the_content', $content);
+	$content = str_replace(']]>', ']]>', $content);
 	echo $content;
 }
 
@@ -257,20 +257,20 @@ 
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  * @return string
  */
-function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_content($more_link_text = null, $strip_teaser = false) {
 	global $page, $more, $preview, $pages, $multipage;
 
 	$post = get_post();
 
-	if ( null === $more_link_text ) {
+	if (null === $more_link_text) {
 		$more_link_text = sprintf(
 			'<span aria-label="%1$s">%2$s</span>',
 			sprintf(
 				/* translators: %s: Name of current post */
-				__( 'Continue reading %s' ),
-				the_title_attribute( array( 'echo' => false ) )
+				__('Continue reading %s'),
+				the_title_attribute(array('echo' => false))
 			),
-			__( '(more&hellip;)' )
+			__('(more&hellip;)')
 		);
 	}
 
@@ -278,38 +278,38 @@ 
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
-		return get_the_password_form( $post );
+	if (post_password_required($post))
+		return get_the_password_form($post);
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
-		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	if ($page > count($pages)) // if the requested page doesn't exist
+		$page = count($pages); // give them the highest numbered page that DOES exist
 
 	$content = $pages[$page - 1];
-	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
-		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
-			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+	if (preg_match('/<!--more(.*?)?-->/', $content, $matches)) {
+		$content = explode($matches[0], $content, 2);
+		if ( ! empty($matches[1]) && ! empty($more_link_text))
+			$more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
 
 		$has_teaser = true;
 	} else {
-		$content = array( $content );
+		$content = array($content);
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
+	if (false !== strpos($post->post_content, '<!--noteaser-->') && ( ! $multipage || $page == 1))
 		$strip_teaser = true;
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
+	if ($more && $strip_teaser && $has_teaser)
 		$teaser = '';
 
 	$output .= $teaser;
 
-	if ( count( $content ) > 1 ) {
-		if ( $more ) {
-			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
+	if (count($content) > 1) {
+		if ($more) {
+			$output .= '<span id="more-'.$post->ID.'"></span>'.$content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
+			if ( ! empty($more_link_text))
 
 				/**
 				 * Filters the Read More link text.
@@ -319,13 +319,13 @@ 
 				 * @param string $more_link_element Read More link element.
 				 * @param string $more_link_text    Read More text.
 				 */
-				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
-			$output = force_balance_tags( $output );
+				$output .= apply_filters('the_content_more_link', ' <a href="'.get_permalink()."#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text);
+			$output = force_balance_tags($output);
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
-		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	if ($preview) // Preview fix for JavaScript bug with foreign languages.
+		$output = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output);
 
 	return $output;
 }
@@ -339,8 +339,8 @@ 
  * @param array $match Match array from preg_replace_callback.
  * @return string
  */
-function _convert_urlencoded_to_entities( $match ) {
-	return '&#' . base_convert( $match[1], 16, 10 ) . ';';
+function _convert_urlencoded_to_entities($match) {
+	return '&#'.base_convert($match[1], 16, 10).';';
 }
 
 /**
@@ -359,7 +359,7 @@ 
 	 *
 	 * @param string $post_excerpt The post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt', get_the_excerpt() );
+	echo apply_filters('the_excerpt', get_the_excerpt());
 }
 
 /**
@@ -371,18 +371,18 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string Post excerpt.
  */
-function get_the_excerpt( $post = null ) {
-	if ( is_bool( $post ) ) {
-		_deprecated_argument( __FUNCTION__, '2.3.0' );
+function get_the_excerpt($post = null) {
+	if (is_bool($post)) {
+		_deprecated_argument(__FUNCTION__, '2.3.0');
 	}
 
-	$post = get_post( $post );
-	if ( empty( $post ) ) {
+	$post = get_post($post);
+	if (empty($post)) {
 		return '';
 	}
 
-	if ( post_password_required( $post ) ) {
-		return __( 'There is no excerpt because this is a protected post.' );
+	if (post_password_required($post)) {
+		return __('There is no excerpt because this is a protected post.');
 	}
 
 	/**
@@ -394,7 +394,7 @@ 
 	 * @param string $post_excerpt The post excerpt.
 	 * @param WP_Post $post Post object.
 	 */
-	return apply_filters( 'get_the_excerpt', $post->post_excerpt, $post );
+	return apply_filters('get_the_excerpt', $post->post_excerpt, $post);
 }
 
 /**
@@ -405,9 +405,9 @@ 
  * @param int|WP_Post $id Optional. Post ID or post object.
  * @return bool
  */
-function has_excerpt( $id = 0 ) {
-	$post = get_post( $id );
-	return ( !empty( $post->post_excerpt ) );
+function has_excerpt($id = 0) {
+	$post = get_post($id);
+	return ( ! empty($post->post_excerpt));
 }
 
 /**
@@ -418,9 +418,9 @@ 
  * @param string|array $class   One or more classes to add to the class list.
  * @param int|WP_Post  $post_id Optional. Post ID or post object. Defaults to the global `$post`.
  */
-function post_class( $class = '', $post_id = null ) {
+function post_class($class = '', $post_id = null) {
 	// Separates classes with a single space, collates classes for post DIV
-	echo 'class="' . join( ' ', get_post_class( $class, $post_id ) ) . '"';
+	echo 'class="'.join(' ', get_post_class($class, $post_id)).'"';
 }
 
 /**
@@ -444,60 +444,60 @@ 
  * @param int|WP_Post  $post_id Optional. Post ID or post object.
  * @return array Array of classes.
  */
-function get_post_class( $class = '', $post_id = null ) {
-	$post = get_post( $post_id );
+function get_post_class($class = '', $post_id = null) {
+	$post = get_post($post_id);
 
 	$classes = array();
 
-	if ( $class ) {
-		if ( ! is_array( $class ) ) {
-			$class = preg_split( '#\s+#', $class );
+	if ($class) {
+		if ( ! is_array($class)) {
+			$class = preg_split('#\s+#', $class);
 		}
-		$classes = array_map( 'esc_attr', $class );
+		$classes = array_map('esc_attr', $class);
 	} else {
 		// Ensure that we always coerce class to being an array.
 		$class = array();
 	}
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return $classes;
 	}
 
-	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
+	$classes[] = 'post-'.$post->ID;
+	if ( ! is_admin())
 		$classes[] = $post->post_type;
-	$classes[] = 'type-' . $post->post_type;
-	$classes[] = 'status-' . $post->post_status;
+	$classes[] = 'type-'.$post->post_type;
+	$classes[] = 'status-'.$post->post_status;
 
 	// Post Format
-	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-		$post_format = get_post_format( $post->ID );
+	if (post_type_supports($post->post_type, 'post-formats')) {
+		$post_format = get_post_format($post->ID);
 
-		if ( $post_format && !is_wp_error($post_format) )
-			$classes[] = 'format-' . sanitize_html_class( $post_format );
+		if ($post_format && ! is_wp_error($post_format))
+			$classes[] = 'format-'.sanitize_html_class($post_format);
 		else
 			$classes[] = 'format-standard';
 	}
 
-	$post_password_required = post_password_required( $post->ID );
+	$post_password_required = post_password_required($post->ID);
 
 	// Post requires password.
-	if ( $post_password_required ) {
+	if ($post_password_required) {
 		$classes[] = 'post-password-required';
-	} elseif ( ! empty( $post->post_password ) ) {
+	} elseif ( ! empty($post->post_password)) {
 		$classes[] = 'post-password-protected';
 	}
 
 	// Post thumbnails.
-	if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) && ! is_attachment( $post ) && ! $post_password_required ) {
+	if (current_theme_supports('post-thumbnails') && has_post_thumbnail($post->ID) && ! is_attachment($post) && ! $post_password_required) {
 		$classes[] = 'has-post-thumbnail';
 	}
 
 	// sticky for Sticky Posts
-	if ( is_sticky( $post->ID ) ) {
-		if ( is_home() && ! is_paged() ) {
+	if (is_sticky($post->ID)) {
+		if (is_home() && ! is_paged()) {
 			$classes[] = 'sticky';
-		} elseif ( is_admin() ) {
+		} elseif (is_admin()) {
 			$classes[] = 'status-sticky';
 		}
 	}
@@ -506,30 +506,30 @@ 
 	$classes[] = 'hentry';
 
 	// All public taxonomies
-	$taxonomies = get_taxonomies( array( 'public' => true ) );
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
-			foreach ( (array) get_the_terms( $post->ID, $taxonomy ) as $term ) {
-				if ( empty( $term->slug ) ) {
+	$taxonomies = get_taxonomies(array('public' => true));
+	foreach ((array) $taxonomies as $taxonomy) {
+		if (is_object_in_taxonomy($post->post_type, $taxonomy)) {
+			foreach ((array) get_the_terms($post->ID, $taxonomy) as $term) {
+				if (empty($term->slug)) {
 					continue;
 				}
 
-				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+				$term_class = sanitize_html_class($term->slug, $term->term_id);
+				if (is_numeric($term_class) || ! trim($term_class, '-')) {
 					$term_class = $term->term_id;
 				}
 
 				// 'post_tag' uses the 'tag' prefix for backward compatibility.
-				if ( 'post_tag' == $taxonomy ) {
-					$classes[] = 'tag-' . $term_class;
+				if ('post_tag' == $taxonomy) {
+					$classes[] = 'tag-'.$term_class;
 				} else {
-					$classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
+					$classes[] = sanitize_html_class($taxonomy.'-'.$term_class, $taxonomy.'-'.$term->term_id);
 				}
 			}
 		}
 	}
 
-	$classes = array_map( 'esc_attr', $classes );
+	$classes = array_map('esc_attr', $classes);
 
 	/**
 	 * Filters the list of CSS classes for the current post.
@@ -540,9 +540,9 @@ 
 	 * @param array $class   An array of additional classes added to the post.
 	 * @param int   $post_id The post ID.
 	 */
-	$classes = apply_filters( 'post_class', $classes, $class, $post->ID );
+	$classes = apply_filters('post_class', $classes, $class, $post->ID);
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
 /**
@@ -552,9 +552,9 @@ 
  *
  * @param string|array $class One or more classes to add to the class list.
  */
-function body_class( $class = '' ) {
+function body_class($class = '') {
 	// Separates classes with a single space, collates classes for body element
-	echo 'class="' . join( ' ', get_body_class( $class ) ) . '"';
+	echo 'class="'.join(' ', get_body_class($class)).'"';
 }
 
 /**
@@ -567,193 +567,193 @@ 
  * @param string|array $class One or more classes to add to the class list.
  * @return array Array of classes.
  */
-function get_body_class( $class = '' ) {
+function get_body_class($class = '') {
 	global $wp_query;
 
 	$classes = array();
 
-	if ( is_rtl() )
+	if (is_rtl())
 		$classes[] = 'rtl';
 
-	if ( is_front_page() )
+	if (is_front_page())
 		$classes[] = 'home';
-	if ( is_home() )
+	if (is_home())
 		$classes[] = 'blog';
-	if ( is_archive() )
+	if (is_archive())
 		$classes[] = 'archive';
-	if ( is_date() )
+	if (is_date())
 		$classes[] = 'date';
-	if ( is_search() ) {
+	if (is_search()) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
+	if (is_paged())
 		$classes[] = 'paged';
-	if ( is_attachment() )
+	if (is_attachment())
 		$classes[] = 'attachment';
-	if ( is_404() )
+	if (is_404())
 		$classes[] = 'error404';
 
-	if ( is_single() ) {
+	if (is_single()) {
 		$post_id = $wp_query->get_queried_object_id();
 		$post = $wp_query->get_queried_object();
 
 		$classes[] = 'single';
-		if ( isset( $post->post_type ) ) {
-			$classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
-			$classes[] = 'postid-' . $post_id;
+		if (isset($post->post_type)) {
+			$classes[] = 'single-'.sanitize_html_class($post->post_type, $post_id);
+			$classes[] = 'postid-'.$post_id;
 
 			// Post Format
-			if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-				$post_format = get_post_format( $post->ID );
+			if (post_type_supports($post->post_type, 'post-formats')) {
+				$post_format = get_post_format($post->ID);
 
-				if ( $post_format && !is_wp_error($post_format) )
-					$classes[] = 'single-format-' . sanitize_html_class( $post_format );
+				if ($post_format && ! is_wp_error($post_format))
+					$classes[] = 'single-format-'.sanitize_html_class($post_format);
 				else
 					$classes[] = 'single-format-standard';
 			}
 		}
 
-		if ( is_attachment() ) {
+		if (is_attachment()) {
 			$mime_type = get_post_mime_type($post_id);
-			$mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
-			$classes[] = 'attachmentid-' . $post_id;
-			$classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
+			$mime_prefix = array('application/', 'image/', 'text/', 'audio/', 'video/', 'music/');
+			$classes[] = 'attachmentid-'.$post_id;
+			$classes[] = 'attachment-'.str_replace($mime_prefix, '', $mime_type);
 		}
-	} elseif ( is_archive() ) {
-		if ( is_post_type_archive() ) {
+	} elseif (is_archive()) {
+		if (is_post_type_archive()) {
 			$classes[] = 'post-type-archive';
-			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
-		} elseif ( is_author() ) {
+			$post_type = get_query_var('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$classes[] = 'post-type-archive-'.sanitize_html_class($post_type);
+		} elseif (is_author()) {
 			$author = $wp_query->get_queried_object();
 			$classes[] = 'author';
-			if ( isset( $author->user_nicename ) ) {
-				$classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
-				$classes[] = 'author-' . $author->ID;
+			if (isset($author->user_nicename)) {
+				$classes[] = 'author-'.sanitize_html_class($author->user_nicename, $author->ID);
+				$classes[] = 'author-'.$author->ID;
 			}
-		} elseif ( is_category() ) {
+		} elseif (is_category()) {
 			$cat = $wp_query->get_queried_object();
 			$classes[] = 'category';
-			if ( isset( $cat->term_id ) ) {
-				$cat_class = sanitize_html_class( $cat->slug, $cat->term_id );
-				if ( is_numeric( $cat_class ) || ! trim( $cat_class, '-' ) ) {
+			if (isset($cat->term_id)) {
+				$cat_class = sanitize_html_class($cat->slug, $cat->term_id);
+				if (is_numeric($cat_class) || ! trim($cat_class, '-')) {
 					$cat_class = $cat->term_id;
 				}
 
-				$classes[] = 'category-' . $cat_class;
-				$classes[] = 'category-' . $cat->term_id;
+				$classes[] = 'category-'.$cat_class;
+				$classes[] = 'category-'.$cat->term_id;
 			}
-		} elseif ( is_tag() ) {
+		} elseif (is_tag()) {
 			$tag = $wp_query->get_queried_object();
 			$classes[] = 'tag';
-			if ( isset( $tag->term_id ) ) {
-				$tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
-				if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) {
+			if (isset($tag->term_id)) {
+				$tag_class = sanitize_html_class($tag->slug, $tag->term_id);
+				if (is_numeric($tag_class) || ! trim($tag_class, '-')) {
 					$tag_class = $tag->term_id;
 				}
 
-				$classes[] = 'tag-' . $tag_class;
-				$classes[] = 'tag-' . $tag->term_id;
+				$classes[] = 'tag-'.$tag_class;
+				$classes[] = 'tag-'.$tag->term_id;
 			}
-		} elseif ( is_tax() ) {
+		} elseif (is_tax()) {
 			$term = $wp_query->get_queried_object();
-			if ( isset( $term->term_id ) ) {
-				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+			if (isset($term->term_id)) {
+				$term_class = sanitize_html_class($term->slug, $term->term_id);
+				if (is_numeric($term_class) || ! trim($term_class, '-')) {
 					$term_class = $term->term_id;
 				}
 
-				$classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-				$classes[] = 'term-' . $term_class;
-				$classes[] = 'term-' . $term->term_id;
+				$classes[] = 'tax-'.sanitize_html_class($term->taxonomy);
+				$classes[] = 'term-'.$term_class;
+				$classes[] = 'term-'.$term->term_id;
 			}
 		}
-	} elseif ( is_page() ) {
+	} elseif (is_page()) {
 		$classes[] = 'page';
 
 		$page_id = $wp_query->get_queried_object_id();
 
 		$post = get_post($page_id);
 
-		$classes[] = 'page-id-' . $page_id;
+		$classes[] = 'page-id-'.$page_id;
 
-		if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) {
+		if (get_pages(array('parent' => $page_id, 'number' => 1))) {
 			$classes[] = 'page-parent';
 		}
 
-		if ( $post->post_parent ) {
+		if ($post->post_parent) {
 			$classes[] = 'page-child';
-			$classes[] = 'parent-pageid-' . $post->post_parent;
+			$classes[] = 'parent-pageid-'.$post->post_parent;
 		}
-		if ( is_page_template() ) {
+		if (is_page_template()) {
 			$classes[] = 'page-template';
 
-			$template_slug  = get_page_template_slug( $page_id );
-			$template_parts = explode( '/', $template_slug );
+			$template_slug  = get_page_template_slug($page_id);
+			$template_parts = explode('/', $template_slug);
 
-			foreach ( $template_parts as $part ) {
-				$classes[] = 'page-template-' . sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) );
+			foreach ($template_parts as $part) {
+				$classes[] = 'page-template-'.sanitize_html_class(str_replace(array('.', '/'), '-', basename($part, '.php')));
 			}
-			$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
+			$classes[] = 'page-template-'.sanitize_html_class(str_replace('.', '-', $template_slug));
 		} else {
 			$classes[] = 'page-template-default';
 		}
 	}
 
-	if ( is_user_logged_in() )
+	if (is_user_logged_in())
 		$classes[] = 'logged-in';
 
-	if ( is_admin_bar_showing() ) {
+	if (is_admin_bar_showing()) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
+	if (get_background_color() !== get_theme_support('custom-background', 'default-color') || get_background_image())
 		$classes[] = 'custom-background';
 
-	if ( has_custom_logo() ) {
+	if (has_custom_logo()) {
 		$classes[] = 'wp-custom-logo';
 	}
 
-	$page = $wp_query->get( 'page' );
-
-	if ( ! $page || $page < 2 )
-		$page = $wp_query->get( 'paged' );
-
-	if ( $page && $page > 1 && ! is_404() ) {
-		$classes[] = 'paged-' . $page;
-
-		if ( is_single() )
-			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
-			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
-			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
-			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
-			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
-			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
-			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
-			$classes[] = 'post-type-paged-' . $page;
+	$page = $wp_query->get('page');
+
+	if ( ! $page || $page < 2)
+		$page = $wp_query->get('paged');
+
+	if ($page && $page > 1 && ! is_404()) {
+		$classes[] = 'paged-'.$page;
+
+		if (is_single())
+			$classes[] = 'single-paged-'.$page;
+		elseif (is_page())
+			$classes[] = 'page-paged-'.$page;
+		elseif (is_category())
+			$classes[] = 'category-paged-'.$page;
+		elseif (is_tag())
+			$classes[] = 'tag-paged-'.$page;
+		elseif (is_date())
+			$classes[] = 'date-paged-'.$page;
+		elseif (is_author())
+			$classes[] = 'author-paged-'.$page;
+		elseif (is_search())
+			$classes[] = 'search-paged-'.$page;
+		elseif (is_post_type_archive())
+			$classes[] = 'post-type-paged-'.$page;
 	}
 
-	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split( '#\s+#', $class );
-		$classes = array_merge( $classes, $class );
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
+			$class = preg_split('#\s+#', $class);
+		$classes = array_merge($classes, $class);
 	} else {
 		// Ensure that we always coerce class to being an array.
 		$class = array();
 	}
 
-	$classes = array_map( 'esc_attr', $classes );
+	$classes = array_map('esc_attr', $classes);
 
 	/**
 	 * Filters the list of CSS body classes for the current post or page.
@@ -763,9 +763,9 @@ 
 	 * @param array $classes An array of body classes.
 	 * @param array $class   An array of additional classes added to the body.
 	 */
-	$classes = apply_filters( 'body_class', $classes, $class );
+	$classes = apply_filters('body_class', $classes, $class);
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
 /**
@@ -776,23 +776,23 @@ 
  * @param int|WP_Post|null $post An optional post. Global $post used if not provided.
  * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
  */
-function post_password_required( $post = null ) {
+function post_password_required($post = null) {
 	$post = get_post($post);
 
-	if ( empty( $post->post_password ) )
+	if (empty($post->post_password))
 		return false;
 
-	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
+	if ( ! isset($_COOKIE['wp-postpass_'.COOKIEHASH]))
 		return true;
 
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
+	require_once ABSPATH.WPINC.'/class-phpass.php';
+	$hasher = new PasswordHash(8, true);
 
-	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-	if ( 0 !== strpos( $hash, '$P$B' ) )
+	$hash = wp_unslash($_COOKIE['wp-postpass_'.COOKIEHASH]);
+	if (0 !== strpos($hash, '$P$B'))
 		return true;
 
-	return ! $hasher->CheckPassword( $post->post_password, $hash );
+	return ! $hasher->CheckPassword($post->post_password, $hash);
 }
 
 //
@@ -833,23 +833,23 @@ 
  * }
  * @return string Formatted output in HTML.
  */
-function wp_link_pages( $args = '' ) {
+function wp_link_pages($args = '') {
 	global $page, $numpages, $multipage, $more;
 
 	$defaults = array(
-		'before'           => '<p>' . __( 'Pages:' ),
+		'before'           => '<p>'.__('Pages:'),
 		'after'            => '</p>',
 		'link_before'      => '',
 		'link_after'       => '',
 		'next_or_number'   => 'number',
 		'separator'        => ' ',
-		'nextpagelink'     => __( 'Next page' ),
-		'previouspagelink' => __( 'Previous page' ),
+		'nextpagelink'     => __('Next page'),
+		'previouspagelink' => __('Previous page'),
 		'pagelink'         => '%',
 		'echo'             => 1
 	);
 
-	$params = wp_parse_args( $args, $defaults );
+	$params = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters the arguments used in retrieving page links for paginated posts.
@@ -858,16 +858,16 @@ 
 	 *
 	 * @param array $params An array of arguments for page links for paginated posts.
 	 */
-	$r = apply_filters( 'wp_link_pages_args', $params );
+	$r = apply_filters('wp_link_pages_args', $params);
 
 	$output = '';
-	if ( $multipage ) {
-		if ( 'number' == $r['next_or_number'] ) {
+	if ($multipage) {
+		if ('number' == $r['next_or_number']) {
 			$output .= $r['before'];
-			for ( $i = 1; $i <= $numpages; $i++ ) {
-				$link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
-				if ( $i != $page || ! $more && 1 == $page ) {
-					$link = _wp_link_page( $i ) . $link . '</a>';
+			for ($i = 1; $i <= $numpages; $i++) {
+				$link = $r['link_before'].str_replace('%', $i, $r['pagelink']).$r['link_after'];
+				if ($i != $page || ! $more && 1 == $page) {
+					$link = _wp_link_page($i).$link.'</a>';
 				}
 				/**
 				 * Filters the HTML output of individual page number links.
@@ -877,31 +877,31 @@ 
 				 * @param string $link The page number HTML output.
 				 * @param int    $i    Page number for paginated posts' page links.
 				 */
-				$link = apply_filters( 'wp_link_pages_link', $link, $i );
+				$link = apply_filters('wp_link_pages_link', $link, $i);
 
 				// Use the custom links separator beginning with the second link.
-				$output .= ( 1 === $i ) ? ' ' : $r['separator'];
+				$output .= (1 === $i) ? ' ' : $r['separator'];
 				$output .= $link;
 			}
 			$output .= $r['after'];
-		} elseif ( $more ) {
+		} elseif ($more) {
 			$output .= $r['before'];
 			$prev = $page - 1;
-			if ( $prev > 0 ) {
-				$link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
+			if ($prev > 0) {
+				$link = _wp_link_page($prev).$r['link_before'].$r['previouspagelink'].$r['link_after'].'</a>';
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$output .= apply_filters( 'wp_link_pages_link', $link, $prev );
+				$output .= apply_filters('wp_link_pages_link', $link, $prev);
 			}
 			$next = $page + 1;
-			if ( $next <= $numpages ) {
-				if ( $prev ) {
+			if ($next <= $numpages) {
+				if ($prev) {
 					$output .= $r['separator'];
 				}
-				$link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
+				$link = _wp_link_page($next).$r['link_before'].$r['nextpagelink'].$r['link_after'].'</a>';
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$output .= apply_filters( 'wp_link_pages_link', $link, $next );
+				$output .= apply_filters('wp_link_pages_link', $link, $next);
 			}
 			$output .= $r['after'];
 		}
@@ -915,9 +915,9 @@ 
 	 * @param string $output HTML output of paginated posts' page links.
 	 * @param array  $args   An array of arguments.
 	 */
-	$html = apply_filters( 'wp_link_pages', $output, $args );
+	$html = apply_filters('wp_link_pages', $output, $args);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -934,33 +934,33 @@ 
  * @param int $i Page number.
  * @return string Link.
  */
-function _wp_link_page( $i ) {
+function _wp_link_page($i) {
 	global $wp_rewrite;
 	$post = get_post();
 	$query_args = array();
 
-	if ( 1 == $i ) {
+	if (1 == $i) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
+		if ('' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')))
+			$url = add_query_arg('page', $i, get_permalink());
+		elseif ('page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID)
+			$url = trailingslashit(get_permalink()).user_trailingslashit("$wp_rewrite->pagination_base/".$i, 'single_paged');
 		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+			$url = trailingslashit(get_permalink()).user_trailingslashit($i, 'single_paged');
 	}
 
-	if ( is_preview() ) {
+	if (is_preview()) {
 
-		if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
-			$query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
-			$query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
+		if (('draft' !== $post->post_status) && isset($_GET['preview_id'], $_GET['preview_nonce'])) {
+			$query_args['preview_id'] = wp_unslash($_GET['preview_id']);
+			$query_args['preview_nonce'] = wp_unslash($_GET['preview_nonce']);
 		}
 
-		$url = get_preview_post_link( $post, $query_args, $url );
+		$url = get_preview_post_link($post, $query_args, $url);
 	}
 
-	return '<a href="' . esc_url( $url ) . '">';
+	return '<a href="'.esc_url($url).'">';
 }
 
 //
@@ -975,12 +975,12 @@ 
  * @param string $key Meta data key name.
  * @return false|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist.
  */
-function post_custom( $key = '' ) {
+function post_custom($key = '') {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
+	if ( ! isset($custom[$key]))
 		return false;
-	elseif ( 1 == count($custom[$key]) )
+	elseif (1 == count($custom[$key]))
 		return $custom[$key][0];
 	else
 		return $custom[$key];
@@ -995,14 +995,14 @@ 
  *
  */
 function the_meta() {
-	if ( $keys = get_post_custom_keys() ) {
+	if ($keys = get_post_custom_keys()) {
 		echo "<ul class='post-meta'>\n";
-		foreach ( (array) $keys as $key ) {
+		foreach ((array) $keys as $key) {
 			$keyt = trim($key);
-			if ( is_protected_meta( $keyt, 'post' ) )
+			if (is_protected_meta($keyt, 'post'))
 				continue;
 			$values = array_map('trim', get_post_custom_values($key));
-			$value = implode($values,', ');
+			$value = implode($values, ', ');
 
 			/**
 			 * Filters the HTML output of the li element in the post custom fields list.
@@ -1013,7 +1013,7 @@ 
 			 * @param string $key   Meta key.
 			 * @param string $value Meta value.
 			 */
-			echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value );
+			echo apply_filters('the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value);
 		}
 		echo "</ul>\n";
 	}
@@ -1051,7 +1051,7 @@ 
  * }
  * @return string HTML content, if not displaying.
  */
-function wp_dropdown_pages( $args = '' ) {
+function wp_dropdown_pages($args = '') {
 	$defaults = array(
 		'depth' => 0, 'child_of' => 0,
 		'selected' => 0, 'echo' => 1,
@@ -1062,29 +1062,29 @@ 
 		'value_field' => 'ID',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$pages = get_pages( $r );
+	$pages = get_pages($r);
 	$output = '';
 	// Back-compat with old system where both id and name were based on $name argument
-	if ( empty( $r['id'] ) ) {
+	if (empty($r['id'])) {
 		$r['id'] = $r['name'];
 	}
 
-	if ( ! empty( $pages ) ) {
+	if ( ! empty($pages)) {
 		$class = '';
-		if ( ! empty( $r['class'] ) ) {
-			$class = " class='" . esc_attr( $r['class'] ) . "'";
+		if ( ! empty($r['class'])) {
+			$class = " class='".esc_attr($r['class'])."'";
 		}
 
-		$output = "<select name='" . esc_attr( $r['name'] ) . "'" . $class . " id='" . esc_attr( $r['id'] ) . "'>\n";
-		if ( $r['show_option_no_change'] ) {
-			$output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
+		$output = "<select name='".esc_attr($r['name'])."'".$class." id='".esc_attr($r['id'])."'>\n";
+		if ($r['show_option_no_change']) {
+			$output .= "\t<option value=\"-1\">".$r['show_option_no_change']."</option>\n";
 		}
-		if ( $r['show_option_none'] ) {
-			$output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
+		if ($r['show_option_none']) {
+			$output .= "\t<option value=\"".esc_attr($r['option_none_value']).'">'.$r['show_option_none']."</option>\n";
 		}
-		$output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
+		$output .= walk_page_dropdown_tree($pages, $r['depth'], $r);
 		$output .= "</select>\n";
 	}
 
@@ -1098,9 +1098,9 @@ 
 	 * @param array  $r      The parsed arguments array.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
  	 */
-	$html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
+	$html = apply_filters('wp_dropdown_pages', $output, $r, $pages);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -1143,26 +1143,26 @@ 
  * }
  * @return string|void HTML list of pages.
  */
-function wp_list_pages( $args = '' ) {
+function wp_list_pages($args = '') {
 	$defaults = array(
 		'depth' => 0, 'show_date' => '',
-		'date_format' => get_option( 'date_format' ),
+		'date_format' => get_option('date_format'),
 		'child_of' => 0, 'exclude' => '',
-		'title_li' => __( 'Pages' ), 'echo' => 1,
+		'title_li' => __('Pages'), 'echo' => 1,
 		'authors' => '', 'sort_column' => 'menu_order, post_title',
 		'link_before' => '', 'link_after' => '', 'walker' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$output = '';
 	$current_page = 0;
 
 	// sanitize, mostly to keep spaces out
-	$r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
+	$r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']);
 
 	// Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
-	$exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
+	$exclude_array = ($r['exclude']) ? explode(',', $r['exclude']) : array();
 
 	/**
 	 * Filters the array of pages to exclude from the pages list.
@@ -1171,29 +1171,29 @@ 
 	 *
 	 * @param array $exclude_array An array of page IDs to exclude.
 	 */
-	$r['exclude'] = implode( ',', apply_filters( 'wp_list_pages_excludes', $exclude_array ) );
+	$r['exclude'] = implode(',', apply_filters('wp_list_pages_excludes', $exclude_array));
 
 	// Query pages.
 	$r['hierarchical'] = 0;
-	$pages = get_pages( $r );
+	$pages = get_pages($r);
 
-	if ( ! empty( $pages ) ) {
-		if ( $r['title_li'] ) {
-			$output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+	if ( ! empty($pages)) {
+		if ($r['title_li']) {
+			$output .= '<li class="pagenav">'.$r['title_li'].'<ul>';
 		}
 		global $wp_query;
-		if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
+		if (is_page() || is_attachment() || $wp_query->is_posts_page) {
 			$current_page = get_queried_object_id();
-		} elseif ( is_singular() ) {
+		} elseif (is_singular()) {
 			$queried_object = get_queried_object();
-			if ( is_post_type_hierarchical( $queried_object->post_type ) ) {
+			if (is_post_type_hierarchical($queried_object->post_type)) {
 				$current_page = $queried_object->ID;
 			}
 		}
 
-		$output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
+		$output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
 
-		if ( $r['title_li'] ) {
+		if ($r['title_li']) {
 			$output .= '</ul></li>';
 		}
 	}
@@ -1210,9 +1210,9 @@ 
 	 * @param array  $r      An array of page-listing arguments.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
 	 */
-	$html = apply_filters( 'wp_list_pages', $output, $r, $pages );
+	$html = apply_filters('wp_list_pages', $output, $r, $pages);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	} else {
 		return $html;
@@ -1248,7 +1248,7 @@ 
  * }
  * @return string|void HTML menu
  */
-function wp_page_menu( $args = array() ) {
+function wp_page_menu($args = array()) {
 	$defaults = array(
 		'sort_column' => 'menu_order, post_title',
 		'menu_id'     => '',
@@ -1261,7 +1261,7 @@ 
 		'after'       => '</ul>',
 		'walker'      => '',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters the arguments used to generate a page-based menu.
@@ -1272,25 +1272,25 @@ 
 	 *
 	 * @param array $args An array of page menu arguments.
 	 */
-	$args = apply_filters( 'wp_page_menu_args', $args );
+	$args = apply_filters('wp_page_menu_args', $args);
 
 	$menu = '';
 
 	$list_args = $args;
 
 	// Show Home in the menu
-	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
+	if ( ! empty($args['show_home'])) {
+		if (true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'])
 			$text = __('Home');
 		else
 			$text = $args['show_home'];
 		$class = '';
-		if ( is_front_page() && !is_paged() )
+		if (is_front_page() && ! is_paged())
 			$class = 'class="current_page_item"';
-		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
+		$menu .= '<li '.$class.'><a href="'.home_url('/').'">'.$args['link_before'].$text.$args['link_after'].'</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
-			if ( !empty( $list_args['exclude'] ) ) {
+			if ( ! empty($list_args['exclude'])) {
 				$list_args['exclude'] .= ',';
 			} else {
 				$list_args['exclude'] = '';
@@ -1301,38 +1301,38 @@ 
 
 	$list_args['echo'] = false;
 	$list_args['title_li'] = '';
-	$menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
+	$menu .= str_replace(array("\r", "\n", "\t"), '', wp_list_pages($list_args));
 
-	$container = sanitize_text_field( $args['container'] );
+	$container = sanitize_text_field($args['container']);
 
 	// Fallback in case `wp_nav_menu()` was called without a container.
-	if ( empty( $container ) ) {
+	if (empty($container)) {
 		$container = 'div';
 	}
 
-	if ( $menu ) {
+	if ($menu) {
 
 		// wp_nav_menu doesn't set before and after
-		if ( isset( $args['fallback_cb'] ) &&
+		if (isset($args['fallback_cb']) &&
 			'wp_page_menu' === $args['fallback_cb'] &&
-			'ul' !== $container ) {
+			'ul' !== $container) {
 			$args['before'] = '<ul>';
 			$args['after'] = '</ul>';
 		}
 
-		$menu = $args['before'] . $menu . $args['after'];
+		$menu = $args['before'].$menu.$args['after'];
 	}
 
 	$attrs = '';
-	if ( ! empty( $args['menu_id'] ) ) {
-		$attrs .= ' id="' . esc_attr( $args['menu_id'] ) . '"';
+	if ( ! empty($args['menu_id'])) {
+		$attrs .= ' id="'.esc_attr($args['menu_id']).'"';
 	}
 
-	if ( ! empty( $args['menu_class'] ) ) {
-		$attrs .= ' class="' . esc_attr( $args['menu_class'] ) . '"';
+	if ( ! empty($args['menu_class'])) {
+		$attrs .= ' class="'.esc_attr($args['menu_class']).'"';
 	}
 
-	$menu = "<{$container}{$attrs}>" . $menu . "</{$container}>\n";
+	$menu = "<{$container}{$attrs}>".$menu."</{$container}>\n";
 
 	/**
 	 * Filters the HTML output of a page-based menu.
@@ -1344,8 +1344,8 @@ 
 	 * @param string $menu The HTML output.
 	 * @param array  $args An array of arguments.
 	 */
-	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
+	$menu = apply_filters('wp_page_menu', $menu, $args);
+	if ($args['echo'])
 		echo $menu;
 	else
 		return $menu;
@@ -1367,15 +1367,15 @@ 
  * @param array $r
  * @return string
  */
-function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
+function walk_page_tree($pages, $depth, $current_page, $r) {
+	if (empty($r['walker']))
 		$walker = new Walker_Page;
 	else
 		$walker = $r['walker'];
 
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
+	foreach ((array) $pages as $page) {
+		if ($page->post_parent)
+			$r['pages_with_children'][$page->post_parent] = true;
 	}
 
 	$args = array($pages, $depth, $r, $current_page);
@@ -1393,7 +1393,7 @@ 
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if (empty($args[2]['walker'])) // the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
 	else
 		$walker = $args[2]['walker'];
@@ -1415,11 +1415,11 @@ 
  * @param bool        $deprecated   Deprecated. Not used.
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
-function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.5.0' );
+function the_attachment_link($id = 0, $fullsize = false, $deprecated = false, $permalink = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.5.0');
 
-	if ( $fullsize )
+	if ($fullsize)
 		echo wp_get_attachment_link($id, 'full', $permalink);
 	else
 		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
@@ -1442,24 +1442,24 @@ 
  * @param array|string $attr      Optional. Array or string of attributes. Default empty.
  * @return string HTML content.
  */
-function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
-	$_post = get_post( $id );
+function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '') {
+	$_post = get_post($id);
 
-	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
-		return __( 'Missing Attachment' );
+	if (empty($_post) || ('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
+		return __('Missing Attachment');
 
-	if ( $permalink )
-		$url = get_attachment_link( $_post->ID );
+	if ($permalink)
+		$url = get_attachment_link($_post->ID);
 
-	if ( $text ) {
+	if ($text) {
 		$link_text = $text;
-	} elseif ( $size && 'none' != $size ) {
-		$link_text = wp_get_attachment_image( $_post->ID, $size, $icon, $attr );
+	} elseif ($size && 'none' != $size) {
+		$link_text = wp_get_attachment_image($_post->ID, $size, $icon, $attr);
 	} else {
 		$link_text = '';
 	}
 
-	if ( trim( $link_text ) == '' )
+	if (trim($link_text) == '')
 		$link_text = $_post->post_title;
 
 	/**
@@ -1475,7 +1475,7 @@ 
 	 * @param bool         $icon      Whether to include an icon. Default false.
 	 * @param string|bool  $text      If string, will be link text. Default false.
 	 */
-	return apply_filters( 'wp_get_attachment_link', "<a href='" . esc_url( $url ) . "'>$link_text</a>", $id, $size, $permalink, $icon, $text );
+	return apply_filters('wp_get_attachment_link', "<a href='".esc_url($url)."'>$link_text</a>", $id, $size, $permalink, $icon, $text);
 }
 
 /**
@@ -1489,22 +1489,22 @@ 
 function prepend_attachment($content) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
+	if (empty($post->post_type) || $post->post_type != 'attachment')
 		return $content;
 
-	if ( wp_attachment_is( 'video', $post ) ) {
-		$meta = wp_get_attachment_metadata( get_the_ID() );
-		$atts = array( 'src' => wp_get_attachment_url() );
-		if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+	if (wp_attachment_is('video', $post)) {
+		$meta = wp_get_attachment_metadata(get_the_ID());
+		$atts = array('src' => wp_get_attachment_url());
+		if ( ! empty($meta['width']) && ! empty($meta['height'])) {
 			$atts['width'] = (int) $meta['width'];
 			$atts['height'] = (int) $meta['height'];
 		}
-		if ( has_post_thumbnail() ) {
-			$atts['poster'] = wp_get_attachment_url( get_post_thumbnail_id() );
+		if (has_post_thumbnail()) {
+			$atts['poster'] = wp_get_attachment_url(get_post_thumbnail_id());
 		}
-		$p = wp_video_shortcode( $atts );
-	} elseif ( wp_attachment_is( 'audio', $post ) ) {
-		$p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) );
+		$p = wp_video_shortcode($atts);
+	} elseif (wp_attachment_is('audio', $post)) {
+		$p = wp_audio_shortcode(array('src' => wp_get_attachment_url()));
 	} else {
 		$p = '<p class="attachment">';
 		// show the medium sized image representation of the attachment if available, and link to the raw file
@@ -1521,7 +1521,7 @@ 
 	 *
 	 * @param string $p The attachment HTML output.
 	 */
-	$p = apply_filters( 'prepend_attachment', $p );
+	$p = apply_filters('prepend_attachment', $p);
 
 	return "$p\n$content";
 }
@@ -1538,12 +1538,12 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string HTML content for password form for password protected post.
  */
-function get_the_password_form( $post = 0 ) {
-	$post = get_post( $post );
-	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
-	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
-	<p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
-	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
+function get_the_password_form($post = 0) {
+	$post = get_post($post);
+	$label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
+	$output = '<form action="'.esc_url(site_url('wp-login.php?action=postpass', 'login_post')).'" class="post-password-form" method="post">
+	<p>' . __('This content is password protected. To view it please enter your password below:').'</p>
+	<p><label for="' . $label.'">'.__('Password:').' <input name="post_password" id="'.$label.'" type="password" size="20" /></label> <input type="submit" name="Submit" value="'.esc_attr_x('Enter', 'post password form').'" /></p></form>
 	';
 
 	/**
@@ -1557,7 +1557,7 @@ 
 	 *
 	 * @param string $output The password form HTML output.
 	 */
-	return apply_filters( 'the_password_form', $output );
+	return apply_filters('the_password_form', $output);
 }
 
 /**
@@ -1573,27 +1573,27 @@ 
  * @param string|array $template The specific template name or array of templates to match.
  * @return bool True on success, false on failure.
  */
-function is_page_template( $template = '' ) {
-	if ( ! is_page() )
+function is_page_template($template = '') {
+	if ( ! is_page())
 		return false;
 
-	$page_template = get_page_template_slug( get_queried_object_id() );
+	$page_template = get_page_template_slug(get_queried_object_id());
 
-	if ( empty( $template ) )
+	if (empty($template))
 		return (bool) $page_template;
 
-	if ( $template == $page_template )
+	if ($template == $page_template)
 		return true;
 
-	if ( is_array( $template ) ) {
-		if ( ( in_array( 'default', $template, true ) && ! $page_template )
-			|| in_array( $page_template, $template, true )
+	if (is_array($template)) {
+		if ((in_array('default', $template, true) && ! $page_template)
+			|| in_array($page_template, $template, true)
 		) {
 			return true;
 		}
 	}
 
-	return ( 'default' === $template && ! $page_template );
+	return ('default' === $template && ! $page_template);
 }
 
 /**
@@ -1605,12 +1605,12 @@ 
  * @return string|false Page template filename. Returns an empty string when the default page template
  * 	is in use. Returns false if the post is not a page.
  */
-function get_page_template_slug( $post_id = null ) {
-	$post = get_post( $post_id );
-	if ( ! $post || 'page' != $post->post_type )
+function get_page_template_slug($post_id = null) {
+	$post = get_post($post_id);
+	if ( ! $post || 'page' != $post->post_type)
 		return false;
-	$template = get_post_meta( $post->ID, '_wp_page_template', true );
-	if ( ! $template || 'default' == $template )
+	$template = get_post_meta($post->ID, '_wp_page_template', true);
+	if ( ! $template || 'default' == $template)
 		return '';
 	return $template;
 }
@@ -1624,28 +1624,28 @@ 
  * @param bool       $link     Optional, default is true. Link to revisions's page?
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
-function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+function wp_post_revision_title($revision, $link = true) {
+	if ( ! $revision = get_post($revision))
 		return $revision;
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array($revision->post_type, array('post', 'page', 'revision')))
 		return false;
 
 	/* translators: revision date format, see https://secure.php.net/date */
-	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
+	$datef = _x('F j, Y @ H:i:s', 'revision date format');
 	/* translators: 1: date */
-	$autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
+	$autosavef = _x('%1$s [Autosave]', 'post revision title extra');
 	/* translators: 1: date */
-	$currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
+	$currentf  = _x('%1$s [Current Revision]', 'post revision title extra');
 
-	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	$date = date_i18n($datef, strtotime($revision->post_modified));
+	if ($link && current_user_can('edit_post', $revision->ID) && $link = get_edit_post_link($revision->ID))
 		$date = "<a href='$link'>$date</a>";
 
-	if ( !wp_is_post_revision( $revision ) )
-		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$date = sprintf( $autosavef, $date );
+	if ( ! wp_is_post_revision($revision))
+		$date = sprintf($currentf, $date);
+	elseif (wp_is_post_autosave($revision))
+		$date = sprintf($autosavef, $date);
 
 	return $date;
 }
@@ -1659,39 +1659,39 @@ 
  * @param bool       $link     Optional, default is true. Link to revisions's page?
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
-function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+function wp_post_revision_title_expanded($revision, $link = true) {
+	if ( ! $revision = get_post($revision))
 		return $revision;
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array($revision->post_type, array('post', 'page', 'revision')))
 		return false;
 
-	$author = get_the_author_meta( 'display_name', $revision->post_author );
+	$author = get_the_author_meta('display_name', $revision->post_author);
 	/* translators: revision date format, see https://secure.php.net/date */
-	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
+	$datef = _x('F j, Y @ H:i:s', 'revision date format');
 
-	$gravatar = get_avatar( $revision->post_author, 24 );
+	$gravatar = get_avatar($revision->post_author, 24);
 
-	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	$date = date_i18n($datef, strtotime($revision->post_modified));
+	if ($link && current_user_can('edit_post', $revision->ID) && $link = get_edit_post_link($revision->ID))
 		$date = "<a href='$link'>$date</a>";
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
-		_x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
+		_x('%1$s %2$s, %3$s ago (%4$s)', 'post revision title'),
 		$gravatar,
 		$author,
-		human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
+		human_time_diff(strtotime($revision->post_modified), current_time('timestamp')),
 		$date
 	);
 
-	$autosavef = __( '%1$s [Autosave]' );
-	$currentf  = __( '%1$s [Current Revision]' );
+	$autosavef = __('%1$s [Autosave]');
+	$currentf  = __('%1$s [Current Revision]');
 
-	if ( !wp_is_post_revision( $revision ) )
-		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	if ( ! wp_is_post_revision($revision))
+		$revision_date_author = sprintf($currentf, $revision_date_author);
+	elseif (wp_is_post_autosave($revision))
+		$revision_date_author = sprintf($autosavef, $revision_date_author);
 
 	/**
 	 * Filters the formatted author and date for a revision.
@@ -1703,7 +1703,7 @@ 
 	 * @param bool    $link                 Whether to link to the revisions page, as passed into
 	 *                                      wp_post_revision_title_expanded().
 	 */
-	return apply_filters( 'wp_post_revision_title_expanded', $revision_date_author, $revision, $link );
+	return apply_filters('wp_post_revision_title_expanded', $revision_date_author, $revision, $link);
 }
 
 /**
@@ -1717,32 +1717,32 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
-function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
+function wp_list_post_revisions($post_id = 0, $type = 'all') {
+	if ( ! $post = get_post($post_id))
 		return;
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
-	if ( is_array( $type ) ) {
-		$type = ! empty( $type['type'] ) ? $type['type']  : $type;
-		_deprecated_argument( __FUNCTION__, '3.6.0' );
+	if (is_array($type)) {
+		$type = ! empty($type['type']) ? $type['type'] : $type;
+		_deprecated_argument(__FUNCTION__, '3.6.0');
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+	if ( ! $revisions = wp_get_post_revisions($post->ID))
 		return;
 
 	$rows = '';
-	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
+	foreach ($revisions as $revision) {
+		if ( ! current_user_can('read_post', $revision->ID))
 			continue;
 
-		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
+		$is_autosave = wp_is_post_autosave($revision);
+		if (('revision' === $type && $is_autosave) || ('autosave' === $type && ! $is_autosave))
 			continue;
 
-		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
+		$rows .= "\t<li>".wp_post_revision_title_expanded($revision)."</li>\n";
 	}
 
-	echo "<div class='hide-if-js'><p>" . __( 'JavaScript must be enabled to use this feature.' ) . "</p></div>\n";
+	echo "<div class='hide-if-js'><p>".__('JavaScript must be enabled to use this feature.')."</p></div>\n";
 
 	echo "<ul class='post-revisions hide-if-no-js'>\n";
 	echo $rows;

Braces +232 added lines, -167 removed lines

@@ -42,16 +42,18 @@ 
 function the_title( $before = '', $after = '', $echo = true ) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
-		return;
+	if ( strlen($title) == 0 ) {
+			return;
+	}
 
 	$title = $before . $title . $after;
 
-	if ( $echo )
-		echo $title;
-	else
-		return $title;
-}
+	if ( $echo ) {
+			echo $title;
+	} else {
+			return $title;
+	}
+	}
 
 /**
  * Sanitize the current title when retrieving or displaying.
@@ -278,30 +280,37 @@ 
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
-		return get_the_password_form( $post );
+	if ( post_password_required( $post ) ) {
+			return get_the_password_form( $post );
+	}
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
-		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	if ( $page > count( $pages ) ) {
+		// if the requested page doesn't exist
+		$page = count( $pages );
+	}
+	// give them the highest numbered page that DOES exist
 
 	$content = $pages[$page - 1];
 	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
 		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
-			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) ) {
+					$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		}
 
 		$has_teaser = true;
 	} else {
 		$content = array( $content );
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
-		$strip_teaser = true;
+	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) ) {
+			$strip_teaser = true;
+	}
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
-		$teaser = '';
+	if ( $more && $strip_teaser && $has_teaser ) {
+			$teaser = '';
+	}
 
 	$output .= $teaser;
 
@@ -309,8 +318,8 @@ 
 		if ( $more ) {
 			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
-
+			if ( ! empty( $more_link_text ) ) {
+			
 				/**
 				 * Filters the Read More link text.
 				 *
@@ -320,12 +329,15 @@ 
 				 * @param string $more_link_text    Read More text.
 				 */
 				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+			}
 			$output = force_balance_tags( $output );
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
+	if ( $preview ) {
+		// Preview fix for JavaScript bug with foreign languages.
 		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	}
 
 	return $output;
 }
@@ -464,8 +476,9 @@ 
 	}
 
 	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
-		$classes[] = $post->post_type;
+	if ( ! is_admin() ) {
+			$classes[] = $post->post_type;
+	}
 	$classes[] = 'type-' . $post->post_type;
 	$classes[] = 'status-' . $post->post_status;
 
@@ -473,10 +486,11 @@ 
 	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 		$post_format = get_post_format( $post->ID );
 
-		if ( $post_format && !is_wp_error($post_format) )
-			$classes[] = 'format-' . sanitize_html_class( $post_format );
-		else
-			$classes[] = 'format-standard';
+		if ( $post_format && !is_wp_error($post_format) ) {
+					$classes[] = 'format-' . sanitize_html_class( $post_format );
+		} else {
+					$classes[] = 'format-standard';
+		}
 	}
 
 	$post_password_required = post_password_required( $post->ID );
@@ -572,27 +586,35 @@ 
 
 	$classes = array();
 
-	if ( is_rtl() )
-		$classes[] = 'rtl';
-
-	if ( is_front_page() )
-		$classes[] = 'home';
-	if ( is_home() )
-		$classes[] = 'blog';
-	if ( is_archive() )
-		$classes[] = 'archive';
-	if ( is_date() )
-		$classes[] = 'date';
+	if ( is_rtl() ) {
+			$classes[] = 'rtl';
+	}
+
+	if ( is_front_page() ) {
+			$classes[] = 'home';
+	}
+	if ( is_home() ) {
+			$classes[] = 'blog';
+	}
+	if ( is_archive() ) {
+			$classes[] = 'archive';
+	}
+	if ( is_date() ) {
+			$classes[] = 'date';
+	}
 	if ( is_search() ) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
-		$classes[] = 'paged';
-	if ( is_attachment() )
-		$classes[] = 'attachment';
-	if ( is_404() )
-		$classes[] = 'error404';
+	if ( is_paged() ) {
+			$classes[] = 'paged';
+	}
+	if ( is_attachment() ) {
+			$classes[] = 'attachment';
+	}
+	if ( is_404() ) {
+			$classes[] = 'error404';
+	}
 
 	if ( is_single() ) {
 		$post_id = $wp_query->get_queried_object_id();
@@ -607,10 +629,11 @@ 
 			if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 				$post_format = get_post_format( $post->ID );
 
-				if ( $post_format && !is_wp_error($post_format) )
-					$classes[] = 'single-format-' . sanitize_html_class( $post_format );
-				else
-					$classes[] = 'single-format-standard';
+				if ( $post_format && !is_wp_error($post_format) ) {
+									$classes[] = 'single-format-' . sanitize_html_class( $post_format );
+				} else {
+									$classes[] = 'single-format-standard';
+				}
 			}
 		}
 
@@ -624,8 +647,9 @@ 
 		if ( is_post_type_archive() ) {
 			$classes[] = 'post-type-archive';
 			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
 		} elseif ( is_author() ) {
 			$author = $wp_query->get_queried_object();
@@ -703,16 +727,18 @@ 
 		}
 	}
 
-	if ( is_user_logged_in() )
-		$classes[] = 'logged-in';
+	if ( is_user_logged_in() ) {
+			$classes[] = 'logged-in';
+	}
 
 	if ( is_admin_bar_showing() ) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
-		$classes[] = 'custom-background';
+	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) {
+			$classes[] = 'custom-background';
+	}
 
 	if ( has_custom_logo() ) {
 		$classes[] = 'wp-custom-logo';
@@ -720,33 +746,36 @@ 
 
 	$page = $wp_query->get( 'page' );
 
-	if ( ! $page || $page < 2 )
-		$page = $wp_query->get( 'paged' );
+	if ( ! $page || $page < 2 ) {
+			$page = $wp_query->get( 'paged' );
+	}
 
 	if ( $page && $page > 1 && ! is_404() ) {
 		$classes[] = 'paged-' . $page;
 
-		if ( is_single() )
-			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
-			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
-			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
-			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
-			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
-			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
-			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
-			$classes[] = 'post-type-paged-' . $page;
+		if ( is_single() ) {
+					$classes[] = 'single-paged-' . $page;
+		} elseif ( is_page() ) {
+					$classes[] = 'page-paged-' . $page;
+		} elseif ( is_category() ) {
+					$classes[] = 'category-paged-' . $page;
+		} elseif ( is_tag() ) {
+					$classes[] = 'tag-paged-' . $page;
+		} elseif ( is_date() ) {
+					$classes[] = 'date-paged-' . $page;
+		} elseif ( is_author() ) {
+					$classes[] = 'author-paged-' . $page;
+		} elseif ( is_search() ) {
+					$classes[] = 'search-paged-' . $page;
+		} elseif ( is_post_type_archive() ) {
+					$classes[] = 'post-type-paged-' . $page;
+		}
 	}
 
 	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split( '#\s+#', $class );
+		if ( !is_array( $class ) ) {
+					$class = preg_split( '#\s+#', $class );
+		}
 		$classes = array_merge( $classes, $class );
 	} else {
 		// Ensure that we always coerce class to being an array.
@@ -779,18 +808,21 @@ 
 function post_password_required( $post = null ) {
 	$post = get_post($post);
 
-	if ( empty( $post->post_password ) )
-		return false;
+	if ( empty( $post->post_password ) ) {
+			return false;
+	}
 
-	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
-		return true;
+	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) ) {
+			return true;
+	}
 
 	require_once ABSPATH . WPINC . '/class-phpass.php';
 	$hasher = new PasswordHash( 8, true );
 
 	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-	if ( 0 !== strpos( $hash, '$P$B' ) )
-		return true;
+	if ( 0 !== strpos( $hash, '$P$B' ) ) {
+			return true;
+	}
 
 	return ! $hasher->CheckPassword( $post->post_password, $hash );
 }
@@ -942,12 +974,13 @@ 
 	if ( 1 == $i ) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
-		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) {
+					$url = add_query_arg( 'page', $i, get_permalink() );
+		} elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) {
+					$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
+		} else {
+					$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		}
 	}
 
 	if ( is_preview() ) {
@@ -978,13 +1011,14 @@ 
 function post_custom( $key = '' ) {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
-		return false;
-	elseif ( 1 == count($custom[$key]) )
-		return $custom[$key][0];
-	else
-		return $custom[$key];
-}
+	if ( !isset( $custom[$key] ) ) {
+			return false;
+	} elseif ( 1 == count($custom[$key]) ) {
+			return $custom[$key][0];
+	} else {
+			return $custom[$key];
+	}
+	}
 
 /**
  * Display list of post custom fields.
@@ -999,8 +1033,9 @@ 
 		echo "<ul class='post-meta'>\n";
 		foreach ( (array) $keys as $key ) {
 			$keyt = trim($key);
-			if ( is_protected_meta( $keyt, 'post' ) )
-				continue;
+			if ( is_protected_meta( $keyt, 'post' ) ) {
+							continue;
+			}
 			$values = array_map('trim', get_post_custom_values($key));
 			$value = implode($values,', ');
 
@@ -1280,13 +1315,15 @@ 
 
 	// Show Home in the menu
 	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
-			$text = __('Home');
-		else
-			$text = $args['show_home'];
+		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] ) {
+					$text = __('Home');
+		} else {
+					$text = $args['show_home'];
+		}
 		$class = '';
-		if ( is_front_page() && !is_paged() )
-			$class = 'class="current_page_item"';
+		if ( is_front_page() && !is_paged() ) {
+					$class = 'class="current_page_item"';
+		}
 		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
@@ -1345,11 +1382,12 @@ 
 	 * @param array  $args An array of arguments.
 	 */
 	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
-		echo $menu;
-	else
-		return $menu;
-}
+	if ( $args['echo'] ) {
+			echo $menu;
+	} else {
+			return $menu;
+	}
+	}
 
 //
 // Page helpers
@@ -1368,14 +1406,16 @@ 
  * @return string
  */
 function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
-		$walker = new Walker_Page;
-	else
-		$walker = $r['walker'];
+	if ( empty($r['walker']) ) {
+			$walker = new Walker_Page;
+	} else {
+			$walker = $r['walker'];
+	}
 
 	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
+		if ( $page->post_parent ) {
+					$r['pages_with_children'][ $page->post_parent ] = true;
+		}
 	}
 
 	$args = array($pages, $depth, $r, $current_page);
@@ -1393,10 +1433,12 @@ 
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if ( empty($args[2]['walker']) ) {
+		// the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
-	else
-		$walker = $args[2]['walker'];
+	} else {
+			$walker = $args[2]['walker'];
+	}
 
 	return call_user_func_array(array($walker, 'walk'), $args);
 }
@@ -1416,14 +1458,16 @@ 
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
 function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.5.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.5.0' );
+	}
 
-	if ( $fullsize )
-		echo wp_get_attachment_link($id, 'full', $permalink);
-	else
-		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
-}
+	if ( $fullsize ) {
+			echo wp_get_attachment_link($id, 'full', $permalink);
+	} else {
+			echo wp_get_attachment_link($id, 'thumbnail', $permalink);
+	}
+	}
 
 /**
  * Retrieve an attachment page link using an image or icon, if possible.
@@ -1445,11 +1489,13 @@ 
 function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
 	$_post = get_post( $id );
 
-	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
-		return __( 'Missing Attachment' );
+	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) ) {
+			return __( 'Missing Attachment' );
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link( $_post->ID );
+	if ( $permalink ) {
+			$url = get_attachment_link( $_post->ID );
+	}
 
 	if ( $text ) {
 		$link_text = $text;
@@ -1459,8 +1505,9 @@ 
 		$link_text = '';
 	}
 
-	if ( trim( $link_text ) == '' )
-		$link_text = $_post->post_title;
+	if ( trim( $link_text ) == '' ) {
+			$link_text = $_post->post_title;
+	}
 
 	/**
 	 * Filters a retrieved attachment page link.
@@ -1489,8 +1536,9 @@ 
 function prepend_attachment($content) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
-		return $content;
+	if ( empty($post->post_type) || $post->post_type != 'attachment' ) {
+			return $content;
+	}
 
 	if ( wp_attachment_is( 'video', $post ) ) {
 		$meta = wp_get_attachment_metadata( get_the_ID() );
@@ -1574,16 +1622,19 @@ 
  * @return bool True on success, false on failure.
  */
 function is_page_template( $template = '' ) {
-	if ( ! is_page() )
-		return false;
+	if ( ! is_page() ) {
+			return false;
+	}
 
 	$page_template = get_page_template_slug( get_queried_object_id() );
 
-	if ( empty( $template ) )
-		return (bool) $page_template;
+	if ( empty( $template ) ) {
+			return (bool) $page_template;
+	}
 
-	if ( $template == $page_template )
-		return true;
+	if ( $template == $page_template ) {
+			return true;
+	}
 
 	if ( is_array( $template ) ) {
 		if ( ( in_array( 'default', $template, true ) && ! $page_template )
@@ -1607,11 +1658,13 @@ 
  */
 function get_page_template_slug( $post_id = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || 'page' != $post->post_type )
-		return false;
+	if ( ! $post || 'page' != $post->post_type ) {
+			return false;
+	}
 	$template = get_post_meta( $post->ID, '_wp_page_template', true );
-	if ( ! $template || 'default' == $template )
-		return '';
+	if ( ! $template || 'default' == $template ) {
+			return '';
+	}
 	return $template;
 }
 
@@ -1625,11 +1678,13 @@ 
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
-		return $revision;
+	if ( !$revision = get_post( $revision ) ) {
+			return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
-		return false;
+	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
+			return false;
+	}
 
 	/* translators: revision date format, see https://secure.php.net/date */
 	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
@@ -1639,13 +1694,15 @@ 
 	$currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-		$date = "<a href='$link'>$date</a>";
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
+			$date = "<a href='$link'>$date</a>";
+	}
 
-	if ( !wp_is_post_revision( $revision ) )
-		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$date = sprintf( $autosavef, $date );
+	if ( !wp_is_post_revision( $revision ) ) {
+			$date = sprintf( $currentf, $date );
+	} elseif ( wp_is_post_autosave( $revision ) ) {
+			$date = sprintf( $autosavef, $date );
+	}
 
 	return $date;
 }
@@ -1660,11 +1717,13 @@ 
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
-		return $revision;
+	if ( !$revision = get_post( $revision ) ) {
+			return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
-		return false;
+	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
+			return false;
+	}
 
 	$author = get_the_author_meta( 'display_name', $revision->post_author );
 	/* translators: revision date format, see https://secure.php.net/date */
@@ -1673,8 +1732,9 @@ 
 	$gravatar = get_avatar( $revision->post_author, 24 );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-		$date = "<a href='$link'>$date</a>";
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
+			$date = "<a href='$link'>$date</a>";
+	}
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
@@ -1688,10 +1748,11 @@ 
 	$autosavef = __( '%1$s [Autosave]' );
 	$currentf  = __( '%1$s [Current Revision]' );
 
-	if ( !wp_is_post_revision( $revision ) )
-		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	if ( !wp_is_post_revision( $revision ) ) {
+			$revision_date_author = sprintf( $currentf, $revision_date_author );
+	} elseif ( wp_is_post_autosave( $revision ) ) {
+			$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	}
 
 	/**
 	 * Filters the formatted author and date for a revision.
@@ -1718,8 +1779,9 @@ 
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
 	if ( is_array( $type ) ) {
@@ -1727,17 +1789,20 @@ 
 		_deprecated_argument( __FUNCTION__, '3.6.0' );
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
-		return;
+	if ( ! $revisions = wp_get_post_revisions( $post->ID ) ) {
+			return;
+	}
 
 	$rows = '';
 	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
-			continue;
+		if ( ! current_user_can( 'read_post', $revision->ID ) ) {
+					continue;
+		}
 
 		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
-			continue;
+		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) ) {
+					continue;
+		}
 
 		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
 	}