ntwb / wordpress

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

Spacing +60 added lines, -60 removed lines

@@ -95,26 +95,26 @@ 
 	 * @param mixed $group   Group level: level (int), no groups (false).
 	 * @return array Handles of items that have been processed.
 	 */
-	public function do_items( $handles = false, $group = false ) {
+	public function do_items($handles = false, $group = false) {
 		/*
 		 * If nothing is passed, print the queue. If a string is passed,
 		 * print that item. If an array is passed, print those items.
 		 */
 		$handles = false === $handles ? $this->queue : (array) $handles;
-		$this->all_deps( $handles );
+		$this->all_deps($handles);
 
-		foreach ( $this->to_do as $key => $handle ) {
-			if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
+		foreach ($this->to_do as $key => $handle) {
+			if ( ! in_array($handle, $this->done, true) && isset($this->registered[$handle])) {
 				/*
 				 * Attempt to process the item. If successful,
 				 * add the handle to the done array.
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
+				if ($this->do_item($handle, $group))
 					$this->done[] = $handle;
 
-				unset( $this->to_do[$key] );
+				unset($this->to_do[$key]);
 			}
 		}
 
@@ -130,7 +130,7 @@ 
 	 * @param string $handle Name of the item. Should be unique.
 	 * @return bool True on success, false if not set.
 	 */
-	public function do_item( $handle ) {
+	public function do_item($handle) {
 		return isset($this->registered[$handle]);
 	}
 
@@ -150,43 +150,43 @@ 
 	 * @param int|false $group     Group level: (int) level, (false) no groups.
 	 * @return bool True on success, false on failure.
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
+	public function all_deps($handles, $recursion = false, $group = false) {
+		if ( ! $handles = (array) $handles)
 			return false;
 
-		foreach ( $handles as $handle ) {
+		foreach ($handles as $handle) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
 			$queued = in_array($handle, $this->to_do, true);
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if (in_array($handle, $this->done, true)) // Already done
 				continue;
 
-			$moved     = $this->set_group( $handle, $recursion, $group );
-			$new_group = $this->groups[ $handle ];
+			$moved     = $this->set_group($handle, $recursion, $group);
+			$new_group = $this->groups[$handle];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ($queued && ! $moved) // already queued and in the right group
 				continue;
 
 			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
+			if ( ! isset($this->registered[$handle]))
 				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
+			elseif ($this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)))
 				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
+			elseif ($this->registered[$handle]->deps && ! $this->all_deps($this->registered[$handle]->deps, true, $new_group))
 				$keep_going = false; // Item requires dependencies that don't exist.
 
-			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
+			if ( ! $keep_going) { // Either item or its dependencies don't exist.
+				if ($recursion)
 					return false; // Abort this branch.
 				else
 					continue; // We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
+			if ($queued) // Already grabbed it and its dependencies.
 				continue;
 
-			if ( isset($handle_parts[1]) )
+			if (isset($handle_parts[1]))
 				$this->args[$handle] = $handle_parts[1];
 
 			$this->to_do[] = $handle;
@@ -214,10 +214,10 @@ 
 	 * @param mixed            $args   Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer. 
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
-	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
+	public function add($handle, $src, $deps = array(), $ver = false, $args = null) {
+		if (isset($this->registered[$handle]))
 			return false;
-		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
+		$this->registered[$handle] = new _WP_Dependency($handle, $src, $deps, $ver, $args);
 		return true;
 	}
 
@@ -234,11 +234,11 @@ 
 	 * @param mixed  $value  The data value.
 	 * @return bool True on success, false on failure.
 	 */
-	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
+	public function add_data($handle, $key, $value) {
+		if ( ! isset($this->registered[$handle]))
 			return false;
 
-		return $this->registered[$handle]->add_data( $key, $value );
+		return $this->registered[$handle]->add_data($key, $value);
 	}
 
 	/**
@@ -253,11 +253,11 @@ 
 	 * @param string $key    The data key.
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
-	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
+	public function get_data($handle, $key) {
+		if ( ! isset($this->registered[$handle]))
 			return false;
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
+		if ( ! isset($this->registered[$handle]->extra[$key]))
 			return false;
 
 		return $this->registered[$handle]->extra[$key];
@@ -273,8 +273,8 @@ 
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 * @return void
 	 */
-	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
+	public function remove($handles) {
+		foreach ((array) $handles as $handle)
 			unset($this->registered[$handle]);
 	}
 
@@ -292,12 +292,12 @@ 
 	 *
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
-	public function enqueue( $handles ) {
-		foreach ( (array) $handles as $handle ) {
+	public function enqueue($handles) {
+		foreach ((array) $handles as $handle) {
 			$handle = explode('?', $handle);
-			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
+			if ( ! in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]])) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
+				if (isset($handle[1]))
 					$this->args[$handle[0]] = $handle[1];
 			}
 		}
@@ -315,11 +315,11 @@ 
 	 *
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
-	public function dequeue( $handles ) {
-		foreach ( (array) $handles as $handle ) {
+	public function dequeue($handles) {
+		foreach ((array) $handles as $handle) {
 			$handle = explode('?', $handle);
 			$key = array_search($handle[0], $this->queue);
-			if ( false !== $key ) {
+			if (false !== $key) {
 				unset($this->queue[$key]);
 				unset($this->args[$handle[0]]);
 			}
@@ -335,15 +335,15 @@ 
 	 * @param string $handle Name of the item. Should be unique.
 	 * @return bool Whether the handle is found after recursively searching the dependency tree.
 	 */
-	protected function recurse_deps( $queue, $handle ) {
-		foreach ( $queue as $queued ) {
-			if ( ! isset( $this->registered[ $queued ] ) ) {
+	protected function recurse_deps($queue, $handle) {
+		foreach ($queue as $queued) {
+			if ( ! isset($this->registered[$queued])) {
 				continue;
 			}
 
-			if ( in_array( $handle, $this->registered[ $queued ]->deps ) ) {
+			if (in_array($handle, $this->registered[$queued]->deps)) {
 				return true;
-			} elseif ( $this->recurse_deps( $this->registered[ $queued ]->deps, $handle ) ) {
+			} elseif ($this->recurse_deps($this->registered[$queued]->deps, $handle)) {
 				return true;
 			}
 		}
@@ -362,28 +362,28 @@ 
 	 * @param string $list   Property name of list array.
 	 * @return bool|_WP_Dependency Found, or object Item data.
 	 */
-	public function query( $handle, $list = 'registered' ) {
-		switch ( $list ) {
+	public function query($handle, $list = 'registered') {
+		switch ($list) {
 			case 'registered' :
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
-					return $this->registered[ $handle ];
+				if (isset($this->registered[$handle]))
+					return $this->registered[$handle];
 				return false;
 
 			case 'enqueued' :
 			case 'queue' :
-				if ( in_array( $handle, $this->queue ) ) {
+				if (in_array($handle, $this->queue)) {
 					return true;
 				}
-				return $this->recurse_deps( $this->queue, $handle );
+				return $this->recurse_deps($this->queue, $handle);
 
 			case 'to_do' :
 			case 'to_print': // back compat
-				return in_array( $handle, $this->to_do );
+				return in_array($handle, $this->to_do);
 
 			case 'done' :
 			case 'printed': // back compat
-				return in_array( $handle, $this->done );
+				return in_array($handle, $this->done);
 		}
 		return false;
 	}
@@ -399,14 +399,14 @@ 
 	 * @param mixed  $group     Group level.
 	 * @return bool Not already in the group or a lower group
 	 */
-	public function set_group( $handle, $recursion, $group ) {
+	public function set_group($handle, $recursion, $group) {
 		$group = (int) $group;
 
-		if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) {
+		if (isset($this->groups[$handle]) && $this->groups[$handle] <= $group) {
 			return false;
 		}
 
-		$this->groups[ $handle ] = $group;
+		$this->groups[$handle] = $group;
 
 		return true;
 	}
@@ -467,7 +467,7 @@ 
 	 * @since 2.6.0
 	 * @var null
 	 */
-	public $args = null;  // Custom property, such as $in_footer or $media.
+	public $args = null; // Custom property, such as $in_footer or $media.
 
 	/**
 	 * Extra data to supply to the handle.
@@ -484,8 +484,8 @@ 
 	 * @since 2.6.0
 	 */
 	public function __construct() {
-		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
+		@list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
+		if ( ! is_array($this->deps))
 			$this->deps = array();
 	}
 
@@ -499,8 +499,8 @@ 
 	 * @param mixed  $data The data value to add.
 	 * @return bool False if not scalar, true otherwise.
 	 */
-	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
+	public function add_data($name, $data) {
+		if ( ! is_scalar($name))
 			return false;
 		$this->extra[$name] = $data;
 		return true;

Braces +65 added lines, -37 removed lines

@@ -111,8 +111,9 @@ 
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
-					$this->done[] = $handle;
+				if ( $this->do_item( $handle, $group ) ) {
+									$this->done[] = $handle;
+				}
 
 				unset( $this->to_do[$key] );
 			}
@@ -151,43 +152,61 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
-			return false;
+		if ( !$handles = (array) $handles ) {
+					return false;
+		}
 
 		foreach ( $handles as $handle ) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
 			$queued = in_array($handle, $this->to_do, true);
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if ( in_array($handle, $this->done, true) ) {
+				// Already done
 				continue;
+			}
 
 			$moved     = $this->set_group( $handle, $recursion, $group );
 			$new_group = $this->groups[ $handle ];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ( $queued && !$moved ) {
+				// already queued and in the right group
 				continue;
+			}
 
 			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
-				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
-				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
-				$keep_going = false; // Item requires dependencies that don't exist.
+			if ( !isset($this->registered[$handle]) ) {
+							$keep_going = false;
+			}
+			// Item doesn't exist.
+			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) ) {
+							$keep_going = false;
+			}
+			// Item requires dependencies that don't exist.
+			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) ) {
+							$keep_going = false;
+			}
+			// Item requires dependencies that don't exist.
 
 			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
-					return false; // Abort this branch.
-				else
-					continue; // We're at the top level. Move on to the next one.
+				if ( $recursion ) {
+									return false;
+				}
+				// Abort this branch.
+				else {
+									continue;
+				}
+				// We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
+			if ( $queued ) {
+				// Already grabbed it and its dependencies.
 				continue;
+			}
 
-			if ( isset($handle_parts[1]) )
-				$this->args[$handle] = $handle_parts[1];
+			if ( isset($handle_parts[1]) ) {
+							$this->args[$handle] = $handle_parts[1];
+			}
 
 			$this->to_do[] = $handle;
 		}
@@ -215,8 +234,9 @@ 
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
 	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
-			return false;
+		if ( isset($this->registered[$handle]) ) {
+					return false;
+		}
 		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
 		return true;
 	}
@@ -235,8 +255,9 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
-			return false;
+		if ( !isset( $this->registered[$handle] ) ) {
+					return false;
+		}
 
 		return $this->registered[$handle]->add_data( $key, $value );
 	}
@@ -254,11 +275,13 @@ 
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
 	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
-			return false;
+		if ( !isset( $this->registered[$handle] ) ) {
+					return false;
+		}
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
-			return false;
+		if ( !isset( $this->registered[$handle]->extra[$key] ) ) {
+					return false;
+		}
 
 		return $this->registered[$handle]->extra[$key];
 	}
@@ -274,8 +297,9 @@ 
 	 * @return void
 	 */
 	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
-			unset($this->registered[$handle]);
+		foreach ( (array) $handles as $handle ) {
+					unset($this->registered[$handle]);
+		}
 	}
 
 	/**
@@ -297,8 +321,9 @@ 
 			$handle = explode('?', $handle);
 			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
-					$this->args[$handle[0]] = $handle[1];
+				if ( isset($handle[1]) ) {
+									$this->args[$handle[0]] = $handle[1];
+				}
 			}
 		}
 	}
@@ -366,8 +391,9 @@ 
 		switch ( $list ) {
 			case 'registered' :
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
-					return $this->registered[ $handle ];
+				if ( isset( $this->registered[ $handle ] ) ) {
+									return $this->registered[ $handle ];
+				}
 				return false;
 
 			case 'enqueued' :
@@ -485,8 +511,9 @@ 
 	 */
 	public function __construct() {
 		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
-			$this->deps = array();
+		if ( ! is_array($this->deps) ) {
+					$this->deps = array();
+		}
 	}
 
 	/**
@@ -500,8 +527,9 @@ 
 	 * @return bool False if not scalar, true otherwise.
 	 */
 	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
-			return false;
+		if ( !is_scalar($name) ) {
+					return false;
+		}
 		$this->extra[$name] = $data;
 		return true;
 	}

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

Indentation +1 added lines, -1 removed lines

@@ -498,7 +498,7 @@
 
 	/**
 	 * Determines script dependencies.
-     *
+	 *
 	 * @since 2.1.0
 	 * @access public
 	 *

Spacing +81 added lines, -81 removed lines

@@ -151,7 +151,7 @@ 
 	 */
 	public function __construct() {
 		$this->init();
-		add_action( 'init', array( $this, 'init' ), 0 );
+		add_action('init', array($this, 'init'), 0);
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 		 *
 		 * @param WP_Scripts &$this WP_Scripts instance, passed by reference.
 		 */
-		do_action_ref_array( 'wp_default_scripts', array(&$this) );
+		do_action_ref_array('wp_default_scripts', array(&$this));
 	}
 
 	/**
@@ -186,8 +186,8 @@ 
 	 *                       Default false.
 	 * @return array Scripts that have been printed.
 	 */
-	public function print_scripts( $handles = false, $group = false ) {
-		return $this->do_items( $handles, $group );
+	public function print_scripts($handles = false, $group = false) {
+		return $this->do_items($handles, $group);
 	}
 
 	/**
@@ -205,9 +205,9 @@ 
 	 *                       Default true.
 	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
 	 */
-	public function print_scripts_l10n( $handle, $echo = true ) {
-		_deprecated_function( __FUNCTION__, '3.3', 'print_extra_script()' );
-		return $this->print_extra_script( $handle, $echo );
+	public function print_scripts_l10n($handle, $echo = true) {
+		_deprecated_function(__FUNCTION__, '3.3', 'print_extra_script()');
+		return $this->print_extra_script($handle, $echo);
 	}
 
 	/**
@@ -221,11 +221,11 @@ 
 	 *                       Default true.
 	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
 	 */
-	public function print_extra_script( $handle, $echo = true ) {
-		if ( !$output = $this->get_data( $handle, 'data' ) )
+	public function print_extra_script($handle, $echo = true) {
+		if ( ! $output = $this->get_data($handle, 'data'))
 			return;
 
-		if ( !$echo )
+		if ( ! $echo)
 			return $output;
 
 		echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5
@@ -250,50 +250,50 @@ 
 	 * @param int|false $group  Optional. Group level: (int) level, (false) no groups. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function do_item( $handle, $group = false ) {
-		if ( !parent::do_item($handle) )
+	public function do_item($handle, $group = false) {
+		if ( ! parent::do_item($handle))
 			return false;
 
-		if ( 0 === $group && $this->groups[$handle] > 0 ) {
+		if (0 === $group && $this->groups[$handle] > 0) {
 			$this->in_footer[] = $handle;
 			return false;
 		}
 
-		if ( false === $group && in_array($handle, $this->in_footer, true) )
-			$this->in_footer = array_diff( $this->in_footer, (array) $handle );
+		if (false === $group && in_array($handle, $this->in_footer, true))
+			$this->in_footer = array_diff($this->in_footer, (array) $handle);
 
 		$obj = $this->registered[$handle];
 
-		if ( null === $obj->ver ) {
+		if (null === $obj->ver) {
 			$ver = '';
 		} else {
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
 		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
+		if (isset($this->args[$handle]))
+			$ver = $ver ? $ver.'&amp;'.$this->args[$handle] : $this->args[$handle];
 
 		$src = $obj->src;
 		$cond_before = $cond_after = '';
-		$conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
+		$conditional = isset($obj->extra['conditional']) ? $obj->extra['conditional'] : '';
 
-		if ( $conditional ) {
+		if ($conditional) {
 			$cond_before = "<!--[if {$conditional}]>\n";
 			$cond_after = "<![endif]-->\n";
 		}
 
-		$before_handle = $this->print_inline_script( $handle, 'before', false );
-		$after_handle = $this->print_inline_script( $handle, 'after', false );
+		$before_handle = $this->print_inline_script($handle, 'before', false);
+		$after_handle = $this->print_inline_script($handle, 'after', false);
 
-		if ( $before_handle ) {
-			$before_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $before_handle );
+		if ($before_handle) {
+			$before_handle = sprintf("<script type='text/javascript'>\n%s\n</script>\n", $before_handle);
 		}
 
-		if ( $after_handle ) {
-			$after_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $after_handle );
+		if ($after_handle) {
+			$after_handle = sprintf("<script type='text/javascript'>\n%s\n</script>\n", $after_handle);
 		}
 
-		if ( $this->do_concat ) {
+		if ($this->do_concat) {
 			/**
 			 * Filter the script loader source.
 			 *
@@ -302,14 +302,14 @@ 
 			 * @param string $src    Script loader source path.
 			 * @param string $handle Script handle.
 			 */
-			$srce = apply_filters( 'script_loader_src', $src, $handle );
+			$srce = apply_filters('script_loader_src', $src, $handle);
 
-			if ( $before_handle && ! $conditional ) {
+			if ($before_handle && ! $conditional) {
 				$this->print_html_before .= $before_handle;
 			}
 
-			if ( $this->in_default_dir( $srce ) && ! $conditional && ! $after_handle ) {
-				$this->print_code .= $this->print_extra_script( $handle, false );
+			if ($this->in_default_dir($srce) && ! $conditional && ! $after_handle) {
+				$this->print_code .= $this->print_extra_script($handle, false);
 				$this->concat .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 				return true;
@@ -319,34 +319,34 @@ 
 			}
 		}
 
-		$has_conditional_data = $conditional && $this->get_data( $handle, 'data' );
+		$has_conditional_data = $conditional && $this->get_data($handle, 'data');
 
-		if ( $has_conditional_data ) {
+		if ($has_conditional_data) {
 			echo $cond_before;
 		}
 
-		$this->print_extra_script( $handle );
+		$this->print_extra_script($handle);
 
-		if ( $has_conditional_data ) {
+		if ($has_conditional_data) {
 			echo $cond_after;
 		}
 
 		// A single item may alias a set of items, by having dependencies, but no source.
-		if ( ! $obj->src ) {
+		if ( ! $obj->src) {
 			return true;
 		}
 
-		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
-			$src = $this->base_url . $src;
+		if ( ! preg_match('|^(https?:)?//|', $src) && ! ($this->content_url && 0 === strpos($src, $this->content_url))) {
+			$src = $this->base_url.$src;
 		}
 
-		if ( ! empty( $ver ) )
-			$src = add_query_arg( 'ver', $ver, $src );
+		if ( ! empty($ver))
+			$src = add_query_arg('ver', $ver, $src);
 
 		/** This filter is documented in wp-includes/class.wp-scripts.php */
-		$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
+		$src = esc_url(apply_filters('script_loader_src', $src, $handle));
 
-		if ( ! $src )
+		if ( ! $src)
 			return true;
 
 		$tag = "{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
@@ -360,10 +360,10 @@ 
 		 * @param string $handle The script's registered handle.
 		 * @param string $src    The script's source URL.
 		 */
-		$tag = apply_filters( 'script_loader_tag', $tag, $handle, $src );
+		$tag = apply_filters('script_loader_tag', $tag, $handle, $src);
 
-		if ( $this->do_concat ) {
-			if ( $after_handle ) {
+		if ($this->do_concat) {
+			if ($after_handle) {
 				$this->print_html_before .= $tag;
 			} else {
 				$this->print_html .= $tag;
@@ -387,19 +387,19 @@ 
 	 *                         or after. Default 'after'.
 	 * @return bool True on success, false on failure.
 	 */
-	public function add_inline_script( $handle, $data, $position = 'after' ) {
-		if ( ! $data ) {
+	public function add_inline_script($handle, $data, $position = 'after') {
+		if ( ! $data) {
 			return false;
 		}
 
-		if ( 'after' !== $position ) {
+		if ('after' !== $position) {
 			$position = 'before';
 		}
 
-		$script   = (array) $this->get_data( $handle, $position );
+		$script   = (array) $this->get_data($handle, $position);
 		$script[] = $data;
 
-		return $this->add_data( $handle, $position, $script );
+		return $this->add_data($handle, $position, $script);
 	}
 
 	/**
@@ -415,17 +415,17 @@ 
 	 *                         Default true.
 	 * @return string|false Script on success, false otherwise.
 	 */
-	public function print_inline_script( $handle, $position = 'after', $echo = true ) {
-		$output = $this->get_data( $handle, $position );
+	public function print_inline_script($handle, $position = 'after', $echo = true) {
+		$output = $this->get_data($handle, $position);
 
-		if ( empty( $output ) ) {
+		if (empty($output)) {
 			return false;
 		}
 
-		$output = trim( implode( "\n", $output ), "\n" );
+		$output = trim(implode("\n", $output), "\n");
 
-		if ( $echo ) {
-			printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
+		if ($echo) {
+			printf("<script type='text/javascript'>\n%s\n</script>\n", $output);
 		}
 
 		return $output;
@@ -442,33 +442,33 @@ 
 	 * @param array $l10n
 	 * @return bool
 	 */
-	public function localize( $handle, $object_name, $l10n ) {
-		if ( $handle === 'jquery' )
+	public function localize($handle, $object_name, $l10n) {
+		if ($handle === 'jquery')
 			$handle = 'jquery-core';
 
-		if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present
+		if (is_array($l10n) && isset($l10n['l10n_print_after'])) { // back compat, preserve the code in 'l10n_print_after' if present
 			$after = $l10n['l10n_print_after'];
 			unset($l10n['l10n_print_after']);
 		}
 
-		foreach ( (array) $l10n as $key => $value ) {
-			if ( !is_scalar($value) )
+		foreach ((array) $l10n as $key => $value) {
+			if ( ! is_scalar($value))
 				continue;
 
-			$l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
+			$l10n[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 		}
 
-		$script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
+		$script = "var $object_name = ".wp_json_encode($l10n).';';
 
-		if ( !empty($after) )
+		if ( ! empty($after))
 			$script .= "\n$after;";
 
-		$data = $this->get_data( $handle, 'data' );
+		$data = $this->get_data($handle, 'data');
 
-		if ( !empty( $data ) )
+		if ( ! empty($data))
 			$script = "$data\n$script";
 
-		return $this->add_data( $handle, 'data', $script );
+		return $this->add_data($handle, 'data', $script);
 	}
 
 	/**
@@ -484,16 +484,16 @@ 
 	 * @param int|false $group     Optional. Group level: (int) level, (false) no groups. Default false.
 	 * @return bool Not already in the group or a lower group
 	 */
-	public function set_group( $handle, $recursion, $group = false ) {
-		if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 )
+	public function set_group($handle, $recursion, $group = false) {
+		if (isset($this->registered[$handle]->args) && $this->registered[$handle]->args === 1)
 			$grp = 1;
 		else
-			$grp = (int) $this->get_data( $handle, 'group' );
+			$grp = (int) $this->get_data($handle, 'group');
 
-		if ( false !== $group && $grp > $group )
+		if (false !== $group && $grp > $group)
 			$grp = $group;
 
-		return parent::set_group( $handle, $recursion, $grp );
+		return parent::set_group($handle, $recursion, $grp);
 	}
 
 	/**
@@ -509,9 +509,9 @@ 
 	 * @param int|false $group     Optional. Group level: (int) level, (false) no groups. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		$r = parent::all_deps( $handles, $recursion, $group );
-		if ( ! $recursion ) {
+	public function all_deps($handles, $recursion = false, $group = false) {
+		$r = parent::all_deps($handles, $recursion, $group);
+		if ( ! $recursion) {
 			/**
 			 * Filter the list of script dependencies left to print.
 			 *
@@ -519,7 +519,7 @@ 
 			 *
 			 * @param array $to_do An array of script dependencies.
 			 */
-			$this->to_do = apply_filters( 'print_scripts_array', $this->to_do );
+			$this->to_do = apply_filters('print_scripts_array', $this->to_do);
 		}
 		return $r;
 	}
@@ -563,17 +563,17 @@ 
 	 * @param string $src The source of the enqueued script.
 	 * @return bool True if found, false if not.
 	 */
-	public function in_default_dir( $src ) {
-		if ( ! $this->default_dirs ) {
+	public function in_default_dir($src) {
+		if ( ! $this->default_dirs) {
 			return true;
 		}
 
-		if ( 0 === strpos( $src, '/' . WPINC . '/js/l10n' ) ) {
+		if (0 === strpos($src, '/'.WPINC.'/js/l10n')) {
 			return false;
 		}
 
-		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos( $src, $test ) ) {
+		foreach ((array) $this->default_dirs as $test) {
+			if (0 === strpos($src, $test)) {
 				return true;
 			}
 		}

Braces +41 added lines, -28 removed lines

@@ -222,11 +222,13 @@ 
 	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
 	 */
 	public function print_extra_script( $handle, $echo = true ) {
-		if ( !$output = $this->get_data( $handle, 'data' ) )
-			return;
+		if ( !$output = $this->get_data( $handle, 'data' ) ) {
+					return;
+		}
 
-		if ( !$echo )
-			return $output;
+		if ( !$echo ) {
+					return $output;
+		}
 
 		echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5
 		echo "/* <![CDATA[ */\n";
@@ -251,16 +253,18 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function do_item( $handle, $group = false ) {
-		if ( !parent::do_item($handle) )
-			return false;
+		if ( !parent::do_item($handle) ) {
+					return false;
+		}
 
 		if ( 0 === $group && $this->groups[$handle] > 0 ) {
 			$this->in_footer[] = $handle;
 			return false;
 		}
 
-		if ( false === $group && in_array($handle, $this->in_footer, true) )
-			$this->in_footer = array_diff( $this->in_footer, (array) $handle );
+		if ( false === $group && in_array($handle, $this->in_footer, true) ) {
+					$this->in_footer = array_diff( $this->in_footer, (array) $handle );
+		}
 
 		$obj = $this->registered[$handle];
 
@@ -270,8 +274,9 @@ 
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
 		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
+		if ( isset($this->args[$handle]) ) {
+					$ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
+		}
 
 		$src = $obj->src;
 		$cond_before = $cond_after = '';
@@ -340,14 +345,16 @@ 
 			$src = $this->base_url . $src;
 		}
 
-		if ( ! empty( $ver ) )
-			$src = add_query_arg( 'ver', $ver, $src );
+		if ( ! empty( $ver ) ) {
+					$src = add_query_arg( 'ver', $ver, $src );
+		}
 
 		/** This filter is documented in wp-includes/class.wp-scripts.php */
 		$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
 
-		if ( ! $src )
-			return true;
+		if ( ! $src ) {
+					return true;
+		}
 
 		$tag = "{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
 
@@ -443,8 +450,9 @@ 
 	 * @return bool
 	 */
 	public function localize( $handle, $object_name, $l10n ) {
-		if ( $handle === 'jquery' )
-			$handle = 'jquery-core';
+		if ( $handle === 'jquery' ) {
+					$handle = 'jquery-core';
+		}
 
 		if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present
 			$after = $l10n['l10n_print_after'];
@@ -452,21 +460,24 @@ 
 		}
 
 		foreach ( (array) $l10n as $key => $value ) {
-			if ( !is_scalar($value) )
-				continue;
+			if ( !is_scalar($value) ) {
+							continue;
+			}
 
 			$l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
 		}
 
 		$script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
 
-		if ( !empty($after) )
-			$script .= "\n$after;";
+		if ( !empty($after) ) {
+					$script .= "\n$after;";
+		}
 
 		$data = $this->get_data( $handle, 'data' );
 
-		if ( !empty( $data ) )
-			$script = "$data\n$script";
+		if ( !empty( $data ) ) {
+					$script = "$data\n$script";
+		}
 
 		return $this->add_data( $handle, 'data', $script );
 	}
@@ -485,13 +496,15 @@ 
 	 * @return bool Not already in the group or a lower group
 	 */
 	public function set_group( $handle, $recursion, $group = false ) {
-		if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 )
-			$grp = 1;
-		else
-			$grp = (int) $this->get_data( $handle, 'group' );
+		if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 ) {
+					$grp = 1;
+		} else {
+					$grp = (int) $this->get_data( $handle, 'group' );
+		}
 
-		if ( false !== $group && $grp > $group )
-			$grp = $group;
+		if ( false !== $group && $grp > $group ) {
+					$grp = $group;
+		}
 
 		return parent::set_group( $handle, $recursion, $grp );
 	}

src/wp-includes/embed.php

Spacing +187 added lines, -187 removed lines

@@ -22,9 +22,9 @@ 
  * @param int      $priority Optional. Used to specify the order in which the registered handlers will
  *                           be tested. Default 10.
  */
-function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) {
+function wp_embed_register_handler($id, $regex, $callback, $priority = 10) {
 	global $wp_embed;
-	$wp_embed->register_handler( $id, $regex, $callback, $priority );
+	$wp_embed->register_handler($id, $regex, $callback, $priority);
 }
 
 /**
@@ -37,9 +37,9 @@ 
  * @param string $id       The handler ID that should be removed.
  * @param int    $priority Optional. The priority of the handler to be removed. Default 10.
  */
-function wp_embed_unregister_handler( $id, $priority = 10 ) {
+function wp_embed_unregister_handler($id, $priority = 10) {
 	global $wp_embed;
-	$wp_embed->unregister_handler( $id, $priority );
+	$wp_embed->unregister_handler($id, $priority);
 }
 
 /**
@@ -60,14 +60,14 @@ 
  *
  * @return array Default embed parameters.
  */
-function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
+function wp_embed_defaults($url = '') {
+	if ( ! empty($GLOBALS['content_width']))
 		$width = (int) $GLOBALS['content_width'];
 
-	if ( empty( $width ) )
+	if (empty($width))
 		$width = 500;
 
-	$height = min( ceil( $width * 1.5 ), 1000 );
+	$height = min(ceil($width * 1.5), 1000);
 
 	/**
 	 * Filter the default array of embed dimensions.
@@ -78,7 +78,7 @@ 
 	 *                     in pixels (in that order).
 	 * @param string $url  The URL that should be embedded.
 	 */
-	return apply_filters( 'embed_defaults', compact( 'width', 'height' ), $url );
+	return apply_filters('embed_defaults', compact('width', 'height'), $url);
 }
 
 /**
@@ -93,10 +93,10 @@ 
  *                     Default empty.
  * @return false|string False on failure or the embed HTML on success.
  */
-function wp_oembed_get( $url, $args = '' ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+function wp_oembed_get($url, $args = '') {
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 	$oembed = _wp_oembed_get_object();
-	return $oembed->get_html( $url, $args );
+	return $oembed->get_html($url, $args);
 }
 
 /**
@@ -111,14 +111,14 @@ 
  * @param string  $provider The URL to the oEmbed provider.
  * @param boolean $regex    Optional. Whether the `$format` parameter is in a RegEx format. Default false.
  */
-function wp_oembed_add_provider( $format, $provider, $regex = false ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+function wp_oembed_add_provider($format, $provider, $regex = false) {
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 
-	if ( did_action( 'plugins_loaded' ) ) {
+	if (did_action('plugins_loaded')) {
 		$oembed = _wp_oembed_get_object();
-		$oembed->providers[$format] = array( $provider, $regex );
+		$oembed->providers[$format] = array($provider, $regex);
 	} else {
-		WP_oEmbed::_add_provider_early( $format, $provider, $regex );
+		WP_oEmbed::_add_provider_early($format, $provider, $regex);
 	}
 }
 
@@ -132,18 +132,18 @@ 
  * @param string $format The URL format for the oEmbed provider to remove.
  * @return bool Was the provider removed successfully?
  */
-function wp_oembed_remove_provider( $format ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+function wp_oembed_remove_provider($format) {
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 
-	if ( did_action( 'plugins_loaded' ) ) {
+	if (did_action('plugins_loaded')) {
 		$oembed = _wp_oembed_get_object();
 
-		if ( isset( $oembed->providers[ $format ] ) ) {
-			unset( $oembed->providers[ $format ] );
+		if (isset($oembed->providers[$format])) {
+			unset($oembed->providers[$format]);
 			return true;
 		}
 	} else {
-		WP_oEmbed::_remove_provider_early( $format );
+		WP_oEmbed::_remove_provider_early($format);
 	}
 
 	return false;
@@ -169,13 +169,13 @@ 
 	 *
 	 * @param bool $maybe_load_embeds Whether to load the embeds library. Default true.
 	 */
-	if ( ! apply_filters( 'load_default_embeds', true ) ) {
+	if ( ! apply_filters('load_default_embeds', true)) {
 		return;
 	}
 
-	wp_embed_register_handler( 'youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube' );
+	wp_embed_register_handler('youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube');
 
-	wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
+	wp_embed_register_handler('googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo');
 
 	/**
 	 * Filter the audio embed handler callback.
@@ -184,7 +184,7 @@ 
 	 *
 	 * @param callable $handler Audio embed handler callback function.
 	 */
-	wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . join( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 );
+	wp_embed_register_handler('audio', '#^https?://.+?\.('.join('|', wp_get_audio_extensions()).')$#i', apply_filters('wp_audio_embed_handler', 'wp_embed_handler_audio'), 9999);
 
 	/**
 	 * Filter the video embed handler callback.
@@ -193,7 +193,7 @@ 
 	 *
 	 * @param callable $handler Video embed handler callback function.
 	 */
-	wp_embed_register_handler( 'video', '#^https?://.+?\.(' . join( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 );
+	wp_embed_register_handler('video', '#^https?://.+?\.('.join('|', wp_get_video_extensions()).')$#i', apply_filters('wp_video_embed_handler', 'wp_embed_handler_video'), 9999);
 }
 
 /**
@@ -210,13 +210,13 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_googlevideo($matches, $attr, $url, $rawattr) {
 	// If the user supplied a fixed width AND height, use it
-	if ( !empty($rawattr['width']) && !empty($rawattr['height']) ) {
+	if ( ! empty($rawattr['width']) && ! empty($rawattr['height'])) {
 		$width  = (int) $rawattr['width'];
 		$height = (int) $rawattr['height'];
 	} else {
-		list( $width, $height ) = wp_expand_dimensions( 425, 344, $attr['width'], $attr['height'] );
+		list($width, $height) = wp_expand_dimensions(425, 344, $attr['width'], $attr['height']);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'embed_googlevideo', '<embed type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docid=' . esc_attr($matches[2]) . '&amp;hl=en&amp;fs=true" style="width:' . esc_attr($width) . 'px;height:' . esc_attr($height) . 'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr );
+	return apply_filters('embed_googlevideo', '<embed type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docid='.esc_attr($matches[2]).'&amp;hl=en&amp;fs=true" style="width:'.esc_attr($width).'px;height:'.esc_attr($height).'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr);
 }
 
 /**
@@ -249,9 +249,9 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_youtube( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_youtube($matches, $attr, $url, $rawattr) {
 	global $wp_embed;
-	$embed = $wp_embed->autoembed( "https://youtube.com/watch?v={$matches[2]}" );
+	$embed = $wp_embed->autoembed("https://youtube.com/watch?v={$matches[2]}");
 
 	/**
 	 * Filter the YoutTube embed output.
@@ -265,7 +265,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_youtube', $embed, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_youtube', $embed, $attr, $url, $rawattr);
 }
 
 /**
@@ -279,8 +279,8 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_audio( $matches, $attr, $url, $rawattr ) {
-	$audio = sprintf( '[audio src="%s" /]', esc_url( $url ) );
+function wp_embed_handler_audio($matches, $attr, $url, $rawattr) {
+	$audio = sprintf('[audio src="%s" /]', esc_url($url));
 
 	/**
 	 * Filter the audio embed output.
@@ -292,7 +292,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_audio', $audio, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_audio', $audio, $attr, $url, $rawattr);
 }
 
 /**
@@ -306,13 +306,13 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_video( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_video($matches, $attr, $url, $rawattr) {
 	$dimensions = '';
-	if ( ! empty( $rawattr['width'] ) && ! empty( $rawattr['height'] ) ) {
-		$dimensions .= sprintf( 'width="%d" ', (int) $rawattr['width'] );
-		$dimensions .= sprintf( 'height="%d" ', (int) $rawattr['height'] );
+	if ( ! empty($rawattr['width']) && ! empty($rawattr['height'])) {
+		$dimensions .= sprintf('width="%d" ', (int) $rawattr['width']);
+		$dimensions .= sprintf('height="%d" ', (int) $rawattr['height']);
 	}
-	$video = sprintf( '[video %s src="%s" /]', $dimensions, esc_url( $url ) );
+	$video = sprintf('[video %s src="%s" /]', $dimensions, esc_url($url));
 
 	/**
 	 * Filter the video embed output.
@@ -324,7 +324,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_video', $video, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_video', $video, $attr, $url, $rawattr);
 }
 
 /**
@@ -345,11 +345,11 @@ 
 function wp_oembed_add_discovery_links() {
 	$output = '';
 
-	if ( is_singular() ) {
-		$output .= '<link rel="alternate" type="application/json+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink() ) ) . '" />' . "\n";
+	if (is_singular()) {
+		$output .= '<link rel="alternate" type="application/json+oembed" href="'.esc_url(get_oembed_endpoint_url(get_permalink())).'" />'."\n";
 
-		if ( class_exists( 'SimpleXMLElement' ) ) {
-			$output .= '<link rel="alternate" type="text/xml+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink(), 'xml' ) ) . '" />' . "\n";
+		if (class_exists('SimpleXMLElement')) {
+			$output .= '<link rel="alternate" type="text/xml+oembed" href="'.esc_url(get_oembed_endpoint_url(get_permalink(), 'xml')).'" />'."\n";
 		}
 	}
 
@@ -360,7 +360,7 @@ 
 	 *
 	 * @param string $output HTML of the discovery links.
 	 */
-	echo apply_filters( 'oembed_discovery_links', $output );
+	echo apply_filters('oembed_discovery_links', $output);
 }
 
 /**
@@ -369,7 +369,7 @@ 
  * @since 4.4.0
  */
 function wp_oembed_add_host_js() {
-	wp_enqueue_script( 'wp-embed' );
+	wp_enqueue_script('wp-embed');
 }
 
 /**
@@ -380,18 +380,18 @@ 
  * @param int|WP_Post $post Optional. Post ID or object. Defaults to the current post.
  * @return string|false The post embed URL on success, false if the post doesn't exist.
  */
-function get_post_embed_url( $post = null ) {
-	$post = get_post( $post );
+function get_post_embed_url($post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	$embed_url     = trailingslashit( get_permalink( $post ) ) . user_trailingslashit( 'embed' );
-	$path_conflict = get_page_by_path( str_replace( home_url(), '', $embed_url ), OBJECT, get_post_types( array( 'public' => true ) ) );
+	$embed_url     = trailingslashit(get_permalink($post)).user_trailingslashit('embed');
+	$path_conflict = get_page_by_path(str_replace(home_url(), '', $embed_url), OBJECT, get_post_types(array('public' => true)));
 
-	if ( ! get_option( 'permalink_structure' ) || $path_conflict ) {
-		$embed_url = add_query_arg( array( 'embed' => 'true' ), get_permalink( $post ) );
+	if ( ! get_option('permalink_structure') || $path_conflict) {
+		$embed_url = add_query_arg(array('embed' => 'true'), get_permalink($post));
 	}
 
 	/**
@@ -402,7 +402,7 @@ 
 	 * @param string  $embed_url The post embed URL.
 	 * @param WP_Post $post      The corresponding post object.
 	 */
-	return esc_url_raw( apply_filters( 'post_embed_url', $embed_url, $post ) );
+	return esc_url_raw(apply_filters('post_embed_url', $embed_url, $post));
 }
 
 /**
@@ -416,18 +416,18 @@ 
  * @param string $format    Optional. The requested response format. Default 'json'.
  * @return string The oEmbed endpoint URL.
  */
-function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
-	$url = rest_url( 'oembed/1.0/embed' );
+function get_oembed_endpoint_url($permalink = '', $format = 'json') {
+	$url = rest_url('oembed/1.0/embed');
 
-	if ( 'json' === $format ) {
+	if ('json' === $format) {
 		$format = false;
 	}
 
-	if ( '' !== $permalink ) {
-		$url = add_query_arg( array(
-			'url'    => urlencode( $permalink ),
+	if ('' !== $permalink) {
+		$url = add_query_arg(array(
+			'url'    => urlencode($permalink),
 			'format' => $format,
-		), $url );
+		), $url);
 	}
 
 	/**
@@ -439,7 +439,7 @@ 
 	 * @param string $permalink The permalink used for the `url` query arg.
 	 * @param string $format    The requested response format.
 	 */
-	return apply_filters( 'oembed_endpoint_url', $url, $permalink, $format );
+	return apply_filters('oembed_endpoint_url', $url, $permalink, $format);
 }
 
 /**
@@ -452,21 +452,21 @@ 
  * @param int|WP_Post $post   Optional. Post ID or object. Default is global `$post`.
  * @return string|false Embed code on success, false if post doesn't exist.
  */
-function get_post_embed_html( $width, $height, $post = null ) {
-	$post = get_post( $post );
+function get_post_embed_html($width, $height, $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	$embed_url = get_post_embed_url( $post );
+	$embed_url = get_post_embed_url($post);
 
-	$output = '<blockquote class="wp-embedded-content"><a href="' . esc_url( get_permalink( $post ) ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
+	$output = '<blockquote class="wp-embedded-content"><a href="'.esc_url(get_permalink($post)).'">'.get_the_title($post)."</a></blockquote>\n";
 
 	$output .= "<script type='text/javascript'>\n";
 	$output .= "<!--//--><![CDATA[//><!--\n";
-	if ( SCRIPT_DEBUG ) {
-		$output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
+	if (SCRIPT_DEBUG) {
+		$output .= file_get_contents(ABSPATH.WPINC.'/js/wp-embed.js');
 	} else {
 		/*
 		 * If you're looking at a src version of this file, you'll see an "include"
@@ -478,7 +478,7 @@ 
 		 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
 		 * and edit wp-embed.js directly.
 		 */
-		$output .=<<<JS
+		$output .= <<<JS
 		include "js/wp-embed.min.js"
 JS;
 	}
@@ -487,15 +487,15 @@ 
 
 	$output .= sprintf(
 		'<iframe sandbox="allow-scripts" security="restricted" src="%1$s" width="%2$d" height="%3$d" title="%4$s" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content"></iframe>',
-		esc_url( $embed_url ),
-		absint( $width ),
-		absint( $height ),
+		esc_url($embed_url),
+		absint($width),
+		absint($height),
 		esc_attr(
 			sprintf(
 				/* translators: 1: post title, 2: site name */
-				__( '&#8220;%1$s&#8221; &#8212; %2$s' ),
-				get_the_title( $post ),
-				get_bloginfo( 'name' )
+				__('&#8220;%1$s&#8221; &#8212; %2$s'),
+				get_the_title($post),
+				get_bloginfo('name')
 			)
 		)
 	);
@@ -510,7 +510,7 @@ 
 	 * @param int     $width  Width of the response.
 	 * @param int     $height Height of the response.
 	 */
-	return apply_filters( 'embed_html', $output, $post, $width, $height );
+	return apply_filters('embed_html', $output, $post, $width, $height);
 }
 
 /**
@@ -522,14 +522,14 @@ 
  * @param int         $width The requested width.
  * @return array|false Response data on success, false if post doesn't exist.
  */
-function get_oembed_response_data( $post, $width ) {
-	$post = get_post( $post );
+function get_oembed_response_data($post, $width) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( 'publish' !== get_post_status( $post ) ) {
+	if ('publish' !== get_post_status($post)) {
 		return false;
 	}
 
@@ -545,29 +545,29 @@ 
 	 *     @type int $max Maximum width. Default 600.
 	 * }
 	 */
-	$min_max_width = apply_filters( 'oembed_min_max_width', array(
+	$min_max_width = apply_filters('oembed_min_max_width', array(
 		'min' => 200,
 		'max' => 600
-	) );
+	));
 
-	$width  = min( max( $min_max_width['min'], $width ), $min_max_width['max'] );
-	$height = max( ceil( $width / 16 * 9 ), 200 );
+	$width  = min(max($min_max_width['min'], $width), $min_max_width['max']);
+	$height = max(ceil($width / 16 * 9), 200);
 
 	$data = array(
 		'version'       => '1.0',
-		'provider_name' => get_bloginfo( 'name' ),
+		'provider_name' => get_bloginfo('name'),
 		'provider_url'  => get_home_url(),
-		'author_name'   => get_bloginfo( 'name' ),
+		'author_name'   => get_bloginfo('name'),
 		'author_url'    => get_home_url(),
 		'title'         => $post->post_title,
 		'type'          => 'link',
 	);
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( $author ) {
+	if ($author) {
 		$data['author_name'] = $author->display_name;
-		$data['author_url']  = get_author_posts_url( $author->ID );
+		$data['author_url']  = get_author_posts_url($author->ID);
 	}
 
 	/**
@@ -580,7 +580,7 @@ 
 	 * @param int     $width  The requested width.
 	 * @param int     $height The calculated height.
 	 */
-	return apply_filters( 'oembed_response_data', $data, $post, $width, $height );
+	return apply_filters('oembed_response_data', $data, $post, $width, $height);
 }
 
 /**
@@ -594,30 +594,30 @@ 
  * @param int     $height The calculated height.
  * @return array The modified response data.
  */
-function get_oembed_response_data_rich( $data, $post, $width, $height ) {
-	$data['width']  = absint( $width );
-	$data['height'] = absint( $height );
+function get_oembed_response_data_rich($data, $post, $width, $height) {
+	$data['width']  = absint($width);
+	$data['height'] = absint($height);
 	$data['type']   = 'rich';
-	$data['html']   = get_post_embed_html( $width, $height, $post );
+	$data['html']   = get_post_embed_html($width, $height, $post);
 
 	// Add post thumbnail to response if available.
 	$thumbnail_id = false;
 
-	if ( has_post_thumbnail( $post->ID ) ) {
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
+	if (has_post_thumbnail($post->ID)) {
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
 	}
 
-	if ( 'attachment' === get_post_type( $post ) ) {
-		if ( wp_attachment_is_image( $post ) ) {
+	if ('attachment' === get_post_type($post)) {
+		if (wp_attachment_is_image($post)) {
 			$thumbnail_id = $post->ID;
-		} else if ( wp_attachment_is( 'video', $post ) ) {
-			$thumbnail_id = get_post_thumbnail_id( $post );
+		} else if (wp_attachment_is('video', $post)) {
+			$thumbnail_id = get_post_thumbnail_id($post);
 			$data['type'] = 'video';
 		}
 	}
 
-	if ( $thumbnail_id ) {
-		list( $thumbnail_url, $thumbnail_width, $thumbnail_height ) = wp_get_attachment_image_src( $thumbnail_id, array( $width, 99999 ) );
+	if ($thumbnail_id) {
+		list($thumbnail_url, $thumbnail_width, $thumbnail_height) = wp_get_attachment_image_src($thumbnail_id, array($width, 99999));
 		$data['thumbnail_url']    = $thumbnail_url;
 		$data['thumbnail_width']  = $thumbnail_width;
 		$data['thumbnail_height'] = $thumbnail_height;
@@ -634,8 +634,8 @@ 
  * @param string $format The oEmbed response format. Accepts 'json' or 'xml'.
  * @return string The format, either 'xml' or 'json'. Default 'json'.
  */
-function wp_oembed_ensure_format( $format ) {
-	if ( ! in_array( $format, array( 'json', 'xml' ), true ) ) {
+function wp_oembed_ensure_format($format) {
+	if ( ! in_array($format, array('json', 'xml'), true)) {
 		return 'json';
 	}
 
@@ -657,35 +657,35 @@ 
  * @param WP_REST_Server            $server  Server instance.
  * @return true
  */
-function _oembed_rest_pre_serve_request( $served, $result, $request, $server ) {
+function _oembed_rest_pre_serve_request($served, $result, $request, $server) {
 	$params = $request->get_params();
 
-	if ( '/oembed/1.0/embed' !== $request->get_route() || 'GET' !== $request->get_method() ) {
+	if ('/oembed/1.0/embed' !== $request->get_route() || 'GET' !== $request->get_method()) {
 		return $served;
 	}
 
-	if ( ! isset( $params['format'] ) || 'xml' !== $params['format'] ) {
+	if ( ! isset($params['format']) || 'xml' !== $params['format']) {
 		return $served;
 	}
 
 	// Embed links inside the request.
-	$data = $server->response_to_data( $result, false );
+	$data = $server->response_to_data($result, false);
 
-	if ( ! class_exists( 'SimpleXMLElement' ) ) {
-		status_header( 501 );
-		die( get_status_header_desc( 501 ) );
+	if ( ! class_exists('SimpleXMLElement')) {
+		status_header(501);
+		die(get_status_header_desc(501));
 	}
 
-	$result = _oembed_create_xml( $data );
+	$result = _oembed_create_xml($data);
 
 	// Bail if there's no XML.
-	if ( ! $result ) {
-		status_header( 501 );
-		return get_status_header_desc( 501 );
+	if ( ! $result) {
+		status_header(501);
+		return get_status_header_desc(501);
 	}
 
-	if ( ! headers_sent() ) {
-		$server->send_header( 'Content-Type', 'text/xml; charset=' . get_option( 'blog_charset' ) );
+	if ( ! headers_sent()) {
+		$server->send_header('Content-Type', 'text/xml; charset='.get_option('blog_charset'));
 	}
 
 	echo $result;
@@ -703,25 +703,25 @@ 
  * @param SimpleXMLElement $node Optional. XML node to append the result to recursively.
  * @return string|false XML string on success, false on error.
  */
-function _oembed_create_xml( $data, $node = null ) {
-	if ( ! is_array( $data ) || empty( $data ) ) {
+function _oembed_create_xml($data, $node = null) {
+	if ( ! is_array($data) || empty($data)) {
 		return false;
 	}
 
-	if ( null === $node ) {
-		$node = new SimpleXMLElement( '<oembed></oembed>' );
+	if (null === $node) {
+		$node = new SimpleXMLElement('<oembed></oembed>');
 	}
 
-	foreach ( $data as $key => $value ) {
-		if ( is_numeric( $key ) ) {
+	foreach ($data as $key => $value) {
+		if (is_numeric($key)) {
 			$key = 'oembed';
 		}
 
-		if ( is_array( $value ) ) {
-			$item = $node->addChild( $key );
-			_oembed_create_xml( $value, $item );
+		if (is_array($value)) {
+			$item = $node->addChild($key);
+			_oembed_create_xml($value, $item);
 		} else {
-			$node->addChild( $key, esc_html( $value ) );
+			$node->addChild($key, esc_html($value));
 		}
 	}
 
@@ -743,16 +743,16 @@ 
  * @param string $url    The URL of the content to be embedded.
  * @return string The filtered and sanitized oEmbed result.
  */
-function wp_filter_oembed_result( $result, $data, $url ) {
-	if ( false === $result || ! in_array( $data->type, array( 'rich', 'video' ) ) ) {
+function wp_filter_oembed_result($result, $data, $url) {
+	if (false === $result || ! in_array($data->type, array('rich', 'video'))) {
 		return $result;
 	}
 
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 	$wp_oembed = _wp_oembed_get_object();
 
 	// Don't modify the HTML for trusted providers.
-	if ( false !== $wp_oembed->get_provider( $url, array( 'discover' => false ) ) ) {
+	if (false !== $wp_oembed->get_provider($url, array('discover' => false))) {
 		return $result;
 	}
 
@@ -773,32 +773,32 @@ 
 		),
 	);
 
-	$html = wp_kses( $result, $allowed_html );
+	$html = wp_kses($result, $allowed_html);
 
-	preg_match( '|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content );
+	preg_match('|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content);
 	// We require at least the iframe to exist.
-	if ( empty( $content[2] ) ) {
+	if (empty($content[2])) {
 		return false;
 	}
-	$html = $content[1] . $content[2];
+	$html = $content[1].$content[2];
 
-	if ( ! empty( $content[1] ) ) {
+	if ( ! empty($content[1])) {
 		// We have a blockquote to fall back on. Hide the iframe by default.
-		$html = str_replace( '<iframe', '<iframe style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', $html );
-		$html = str_replace( '<blockquote', '<blockquote class="wp-embedded-content"', $html );
+		$html = str_replace('<iframe', '<iframe style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', $html);
+		$html = str_replace('<blockquote', '<blockquote class="wp-embedded-content"', $html);
 	}
 
-	$html = str_replace( '<iframe', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $html );
+	$html = str_replace('<iframe', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $html);
 
-	preg_match( '/ src=[\'"]([^\'"]*)[\'"]/', $html, $results );
+	preg_match('/ src=[\'"]([^\'"]*)[\'"]/', $html, $results);
 
-	if ( ! empty( $results ) ) {
-		$secret = wp_generate_password( 10, false );
+	if ( ! empty($results)) {
+		$secret = wp_generate_password(10, false);
 
-		$url = esc_url( "{$results[1]}#?secret=$secret" );
+		$url = esc_url("{$results[1]}#?secret=$secret");
 
-		$html = str_replace( $results[0], " src=\"$url\" data-secret=\"$secret\"", $html );
-		$html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
+		$html = str_replace($results[0], " src=\"$url\" data-secret=\"$secret\"", $html);
+		$html = str_replace('<blockquote', "<blockquote data-secret=\"$secret\"", $html);
 	}
 
 	return $html;
@@ -815,17 +815,17 @@ 
  * @param string $more_string Default 'more' string.
  * @return string 'Continue reading' link prepended with an ellipsis.
  */
-function wp_embed_excerpt_more( $more_string ) {
-	if ( ! is_embed() ) {
+function wp_embed_excerpt_more($more_string) {
+	if ( ! is_embed()) {
 		return $more_string;
 	}
 
-	$link = sprintf( '<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
-		esc_url( get_permalink() ),
+	$link = sprintf('<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
+		esc_url(get_permalink()),
 		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading %s' ), '<span class="screen-reader-text">' . get_the_title() . '</span>' )
+		sprintf(__('Continue reading %s'), '<span class="screen-reader-text">'.get_the_title().'</span>')
 	);
-	return ' &hellip; ' . $link;
+	return ' &hellip; '.$link;
 }
 
 /**
@@ -845,7 +845,7 @@ 
 	 *
 	 * @param string $output The current post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt_embed', $output );
+	echo apply_filters('the_excerpt_embed', $output);
 }
 
 /**
@@ -858,9 +858,9 @@ 
  * @param string $content The current post excerpt.
  * @return string The modified post excerpt.
  */
-function wp_embed_excerpt_attachment( $content ) {
-	if ( is_attachment() ) {
-		return prepend_attachment( '' );
+function wp_embed_excerpt_attachment($content) {
+	if (is_attachment()) {
+		return prepend_attachment('');
 	}
 
 	return $content;
@@ -877,15 +877,15 @@ 
  * @since 4.4.0
  */
 function enqueue_embed_scripts() {
-	wp_enqueue_style( 'open-sans' );
-	wp_enqueue_style( 'wp-embed-template-ie' );
+	wp_enqueue_style('open-sans');
+	wp_enqueue_style('wp-embed-template-ie');
 
 	/**
 	 * Fires when scripts and styles are enqueued for the embed iframe.
 	 *
 	 * @since 4.4.0
 	 */
-	do_action( 'enqueue_embed_scripts' );
+	do_action('enqueue_embed_scripts');
 }
 
 /**
@@ -897,8 +897,8 @@ 
 	?>
 	<style type="text/css">
 	<?php
-		if ( SCRIPT_DEBUG ) {
-			readfile( ABSPATH . WPINC . "/css/wp-embed-template.css" );
+		if (SCRIPT_DEBUG) {
+			readfile(ABSPATH.WPINC."/css/wp-embed-template.css");
 		} else {
 			/*
 			 * If you're looking at a src version of this file, you'll see an "include"
@@ -928,8 +928,8 @@ 
 	?>
 	<script type="text/javascript">
 	<?php
-		if ( SCRIPT_DEBUG ) {
-			readfile( ABSPATH . WPINC . "/js/wp-embed-template.js" );
+		if (SCRIPT_DEBUG) {
+			readfile(ABSPATH.WPINC."/js/wp-embed-template.js");
 		} else {
 			/*
 			 * If you're looking at a src version of this file, you'll see an "include"
@@ -959,8 +959,8 @@ 
  * @param string $content The content to filter.
  * @return string The filtered content.
  */
-function _oembed_filter_feed_content( $content ) {
-	return str_replace( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $content );
+function _oembed_filter_feed_content($content) {
+	return str_replace('<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $content);
 }
 
 /**
@@ -969,7 +969,7 @@ 
  * @since 4.4.0
  */
 function print_embed_comments_button() {
-	if ( is_404() || ! ( get_comments_number() || comments_open() ) ) {
+	if (is_404() || ! (get_comments_number() || comments_open())) {
 		return;
 	}
 	?>
@@ -983,7 +983,7 @@ 
 					'%s <span class="screen-reader-text">Comments</span>',
 					get_comments_number()
 				),
-				number_format_i18n( get_comments_number() )
+				number_format_i18n(get_comments_number())
 			);
 			?>
 		</a>
@@ -997,12 +997,12 @@ 
  * @since 4.4.0
  */
 function print_embed_sharing_button() {
-	if ( is_404() ) {
+	if (is_404()) {
 		return;
 	}
 	?>
 	<div class="wp-embed-share">
-		<button type="button" class="wp-embed-share-dialog-open" aria-label="<?php esc_attr_e( 'Open sharing dialog' ); ?>">
+		<button type="button" class="wp-embed-share-dialog-open" aria-label="<?php esc_attr_e('Open sharing dialog'); ?>">
 			<span class="dashicons dashicons-share"></span>
 		</button>
 	</div>
@@ -1015,38 +1015,38 @@ 
  * @since 4.4.0
  */
 function print_embed_sharing_dialog() {
-	if ( is_404() ) {
+	if (is_404()) {
 		return;
 	}
 	?>
-	<div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e( 'Sharing options' ); ?>">
+	<div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e('Sharing options'); ?>">
 		<div class="wp-embed-share-dialog-content">
 			<div class="wp-embed-share-dialog-text">
 				<ul class="wp-embed-share-tabs" role="tablist">
 					<li class="wp-embed-share-tab-button wp-embed-share-tab-button-wordpress" role="presentation">
-						<button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
+						<button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e('WordPress Embed'); ?></button>
 					</li>
 					<li class="wp-embed-share-tab-button wp-embed-share-tab-button-html" role="presentation">
-						<button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
+						<button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e('HTML Embed'); ?></button>
 					</li>
 				</ul>
 				<div id="wp-embed-share-tab-wordpress" class="wp-embed-share-tab" role="tabpanel" aria-hidden="false">
 					<input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" aria-describedby="wp-embed-share-description-wordpress" tabindex="0" readonly/>
 
 					<p class="wp-embed-share-description" id="wp-embed-share-description-wordpress">
-						<?php _e( 'Copy and paste this URL into your WordPress site to embed' ); ?>
+						<?php _e('Copy and paste this URL into your WordPress site to embed'); ?>
 					</p>
 				</div>
 				<div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-hidden="true">
-					<textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
+					<textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea(get_post_embed_html(600, 400)); ?></textarea>
 
 					<p class="wp-embed-share-description" id="wp-embed-share-description-html">
-						<?php _e( 'Copy and paste this code into your site to embed' ); ?>
+						<?php _e('Copy and paste this code into your site to embed'); ?>
 					</p>
 				</div>
 			</div>
 
-			<button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e( 'Close sharing dialog' ); ?>">
+			<button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e('Close sharing dialog'); ?>">
 				<span class="dashicons dashicons-no"></span>
 			</button>
 		</div>
@@ -1062,13 +1062,13 @@ 
 function the_embed_site_title() {
 	$site_title = sprintf(
 		'<a href="%s" target="_top"><img src="%s" srcset="%s 2x" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
-		esc_url( home_url() ),
-		esc_url( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) ),
-		esc_url( get_site_icon_url( 64, admin_url( 'images/w-logo-blue.png' ) ) ),
-		esc_html( get_bloginfo( 'name' ) )
+		esc_url(home_url()),
+		esc_url(get_site_icon_url(32, admin_url('images/w-logo-blue.png'))),
+		esc_url(get_site_icon_url(64, admin_url('images/w-logo-blue.png'))),
+		esc_html(get_bloginfo('name'))
 	);
 
-	$site_title = '<div class="wp-embed-site-title">' . $site_title . '</div>';
+	$site_title = '<div class="wp-embed-site-title">'.$site_title.'</div>';
 
 	/**
 	 * Filter the site title HTML in the embed footer.
@@ -1077,5 +1077,5 @@ 
 	 *
 	 * @param string $site_title The site title HTML.
 	 */
-	echo apply_filters( 'embed_site_title_html', $site_title );
+	echo apply_filters('embed_site_title_html', $site_title);
 }

Braces +6 added lines, -4 removed lines

@@ -61,11 +61,13 @@
  * @return array Default embed parameters.
  */
 function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
-		$width = (int) $GLOBALS['content_width'];
+	if ( ! empty( $GLOBALS['content_width'] ) ) {
+			$width = (int) $GLOBALS['content_width'];
+	}
 
-	if ( empty( $width ) )
-		$width = 500;
+	if ( empty( $width ) ) {
+			$width = 500;
+	}
 
 	$height = min( ceil( $width * 1.5 ), 1000 );
 

src/wp-includes/rewrite.php

Spacing +97 added lines, -97 removed lines

@@ -109,14 +109,14 @@ 
  *
  * @since 3.7.0
  */
-define( 'EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS );
+define('EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS);
 
 /**
  * Endpoint Mask for everything.
  *
  * @since 2.1.0
  */
-define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES );
+define('EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES);
 
 /**
  * Adds a rewrite rule that transforms a URL structure to a set of query vars.
@@ -134,10 +134,10 @@ 
  * @param string       $after Optional. Priority of the new rule. Accepts 'top'
  *                            or 'bottom'. Default 'bottom'.
  */
-function add_rewrite_rule( $regex, $query, $after = 'bottom' ) {
+function add_rewrite_rule($regex, $query, $after = 'bottom') {
 	global $wp_rewrite;
 
-	$wp_rewrite->add_rule( $regex, $query, $after );
+	$wp_rewrite->add_rule($regex, $query, $after);
 }
 
 /**
@@ -156,20 +156,20 @@ 
  * @param string $regex Regular expression to substitute the tag for in rewrite rules.
  * @param string $query Optional. String to append to the rewritten query. Must end in '='. Default empty.
  */
-function add_rewrite_tag( $tag, $regex, $query = '' ) {
+function add_rewrite_tag($tag, $regex, $query = '') {
 	// validate the tag's name
-	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' )
+	if (strlen($tag) < 3 || $tag[0] != '%' || $tag[strlen($tag) - 1] != '%')
 		return;
 
 	global $wp_rewrite, $wp;
 
-	if ( empty( $query ) ) {
-		$qv = trim( $tag, '%' );
-		$wp->add_query_var( $qv );
-		$query = $qv . '=';
+	if (empty($query)) {
+		$qv = trim($tag, '%');
+		$wp->add_query_var($qv);
+		$query = $qv.'=';
 	}
 
-	$wp_rewrite->add_rewrite_tag( $tag, $regex, $query );
+	$wp_rewrite->add_rewrite_tag($tag, $regex, $query);
 }
 
 /**
@@ -181,9 +181,9 @@ 
  *
  * @param string $tag Name of the rewrite tag.
  */
-function remove_rewrite_tag( $tag ) {
+function remove_rewrite_tag($tag) {
 	global $wp_rewrite;
-	$wp_rewrite->remove_rewrite_tag( $tag );
+	$wp_rewrite->remove_rewrite_tag($tag);
 }
 
 /**
@@ -199,16 +199,16 @@ 
  * @param array  $args   Optional. Arguments for building the rules from the permalink structure,
  *                       see WP_Rewrite::add_permastruct() for full details. Default empty array.
  */
-function add_permastruct( $name, $struct, $args = array() ) {
+function add_permastruct($name, $struct, $args = array()) {
 	global $wp_rewrite;
 
 	// backwards compatibility for the old parameters: $with_front and $ep_mask
-	if ( ! is_array( $args ) )
-		$args = array( 'with_front' => $args );
-	if ( func_num_args() == 4 )
-		$args['ep_mask'] = func_get_arg( 3 );
+	if ( ! is_array($args))
+		$args = array('with_front' => $args);
+	if (func_num_args() == 4)
+		$args['ep_mask'] = func_get_arg(3);
 
-	$wp_rewrite->add_permastruct( $name, $struct, $args );
+	$wp_rewrite->add_permastruct($name, $struct, $args);
 }
 
 /**
@@ -224,10 +224,10 @@ 
  *
  * @param string $name Name for permalink structure.
  */
-function remove_permastruct( $name ) {
+function remove_permastruct($name) {
 	global $wp_rewrite;
 
-	$wp_rewrite->remove_permastruct( $name );
+	$wp_rewrite->remove_permastruct($name);
 }
 
 /**
@@ -241,19 +241,19 @@ 
  * @param callable $function Callback to run on feed display.
  * @return string Feed action name.
  */
-function add_feed( $feedname, $function ) {
+function add_feed($feedname, $function) {
 	global $wp_rewrite;
 
-	if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) {
+	if ( ! in_array($feedname, $wp_rewrite->feeds)) {
 		$wp_rewrite->feeds[] = $feedname;
 	}
 
-	$hook = 'do_feed_' . $feedname;
+	$hook = 'do_feed_'.$feedname;
 
 	// Remove default function hook
-	remove_action( $hook, $hook );
+	remove_action($hook, $hook);
 
-	add_action( $hook, $function, 10, 2 );
+	add_action($hook, $function, 10, 2);
 
 	return $hook;
 }
@@ -268,9 +268,9 @@ 
  * @param bool $hard Whether to update .htaccess (hard flush) or just update
  * 	                 rewrite_rules transient (soft flush). Default is true (hard).
  */
-function flush_rewrite_rules( $hard = true ) {
+function flush_rewrite_rules($hard = true) {
 	global $wp_rewrite;
-	$wp_rewrite->flush_rules( $hard );
+	$wp_rewrite->flush_rules($hard);
 }
 
 /**
@@ -305,9 +305,9 @@ 
  * @param string|bool $query_var Name of the corresponding query variable. Pass `false` to skip registering a query_var
  *                               for this endpoint. Defaults to the value of `$name`.
  */
-function add_rewrite_endpoint( $name, $places, $query_var = true ) {
+function add_rewrite_endpoint($name, $places, $query_var = true) {
 	global $wp_rewrite;
-	$wp_rewrite->add_endpoint( $name, $places, $query_var );
+	$wp_rewrite->add_endpoint($name, $places, $query_var);
 }
 
 /**
@@ -321,10 +321,10 @@ 
  * @param string $base The taxonomy base that we're going to filter
  * @return string
  */
-function _wp_filter_taxonomy_base( $base ) {
-	if ( !empty( $base ) ) {
-		$base = preg_replace( '|^/index\.php/|', '', $base );
-		$base = trim( $base, '/' );
+function _wp_filter_taxonomy_base($base) {
+	if ( ! empty($base)) {
+		$base = preg_replace('|^/index\.php/|', '', $base);
+		$base = trim($base, '/');
 	}
 	return $base;
 }
@@ -351,16 +351,16 @@ 
  *                          WP::parse_request(). Default empty array.
  * @return array Returns the original array of query vars, with date/post conflicts resolved.
  */
-function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) {
-	if ( ! isset( $query_vars['year'] ) && ! isset( $query_vars['monthnum'] ) && ! isset( $query_vars['day'] ) ) {
+function wp_resolve_numeric_slug_conflicts($query_vars = array()) {
+	if ( ! isset($query_vars['year']) && ! isset($query_vars['monthnum']) && ! isset($query_vars['day'])) {
 		return $query_vars;
 	}
 
 	// Identify the 'postname' position in the permastruct array.
-	$permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-	$postname_index = array_search( '%postname%', $permastructs );
+	$permastructs   = array_values(array_filter(explode('/', get_option('permalink_structure'))));
+	$postname_index = array_search('%postname%', $permastructs);
 
-	if ( false === $postname_index ) {
+	if (false === $postname_index) {
 		return $query_vars;
 	}
 
@@ -371,35 +371,35 @@ 
 	 * for month-slug clashes when `is_month` *or* `is_day`.
 	 */
 	$compare = '';
-	if ( 0 === $postname_index && ( isset( $query_vars['year'] ) || isset( $query_vars['monthnum'] ) ) ) {
+	if (0 === $postname_index && (isset($query_vars['year']) || isset($query_vars['monthnum']))) {
 		$compare = 'year';
-	} elseif ( '%year%' === $permastructs[ $postname_index - 1 ] && ( isset( $query_vars['monthnum'] ) || isset( $query_vars['day'] ) ) ) {
+	} elseif ('%year%' === $permastructs[$postname_index - 1] && (isset($query_vars['monthnum']) || isset($query_vars['day']))) {
 		$compare = 'monthnum';
-	} elseif ( '%monthnum%' === $permastructs[ $postname_index - 1 ] && isset( $query_vars['day'] ) ) {
+	} elseif ('%monthnum%' === $permastructs[$postname_index - 1] && isset($query_vars['day'])) {
 		$compare = 'day';
 	}
 
-	if ( ! $compare ) {
+	if ( ! $compare) {
 		return $query_vars;
 	}
 
 	// This is the potentially clashing slug.
-	$value = $query_vars[ $compare ];
+	$value = $query_vars[$compare];
 
-	$post = get_page_by_path( $value, OBJECT, 'post' );
-	if ( ! ( $post instanceof WP_Post ) ) {
+	$post = get_page_by_path($value, OBJECT, 'post');
+	if ( ! ($post instanceof WP_Post)) {
 		return $query_vars;
 	}
 
 	// If the date of the post doesn't match the date specified in the URL, resolve to the date archive.
-	if ( preg_match( '/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches ) && isset( $query_vars['year'] ) && ( 'monthnum' === $compare || 'day' === $compare ) ) {
+	if (preg_match('/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches) && isset($query_vars['year']) && ('monthnum' === $compare || 'day' === $compare)) {
 		// $matches[1] is the year the post was published.
-		if ( intval( $query_vars['year'] ) !== intval( $matches[1] ) ) {
+		if (intval($query_vars['year']) !== intval($matches[1])) {
 			return $query_vars;
 		}
 
 		// $matches[2] is the month the post was published.
-		if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && intval( $query_vars['monthnum'] ) !== intval( $matches[2] ) ) {
+		if ('day' === $compare && isset($query_vars['monthnum']) && intval($query_vars['monthnum']) !== intval($matches[2])) {
 			return $query_vars;
 		}
 	}
@@ -409,35 +409,35 @@ 
 	 * intended as the page number. Verify that it's a valid page before resolving to it.
 	 */
 	$maybe_page = '';
-	if ( 'year' === $compare && isset( $query_vars['monthnum'] ) ) {
+	if ('year' === $compare && isset($query_vars['monthnum'])) {
 		$maybe_page = $query_vars['monthnum'];
-	} elseif ( 'monthnum' === $compare && isset( $query_vars['day'] ) ) {
+	} elseif ('monthnum' === $compare && isset($query_vars['day'])) {
 		$maybe_page = $query_vars['day'];
 	}
 	// Bug found in #11694 - 'page' was returning '/4'
-	$maybe_page = (int) trim( $maybe_page, '/' );
+	$maybe_page = (int) trim($maybe_page, '/');
 
-	$post_page_count = substr_count( $post->post_content, '<!--nextpage-->' ) + 1;
+	$post_page_count = substr_count($post->post_content, '<!--nextpage-->') + 1;
 
 	// If the post doesn't have multiple pages, but a 'page' candidate is found, resolve to the date archive.
-	if ( 1 === $post_page_count && $maybe_page ) {
+	if (1 === $post_page_count && $maybe_page) {
 		return $query_vars;
 	}
 
 	// If the post has multiple pages and the 'page' number isn't valid, resolve to the date archive.
-	if ( $post_page_count > 1 && $maybe_page > $post_page_count ) {
+	if ($post_page_count > 1 && $maybe_page > $post_page_count) {
 		return $query_vars;
 	}
 
 	// If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage.
-	if ( '' !== $maybe_page ) {
-		$query_vars['page'] = intval( $maybe_page );
+	if ('' !== $maybe_page) {
+		$query_vars['page'] = intval($maybe_page);
 	}
 
 	// Next, unset autodetected date-related query vars.
-	unset( $query_vars['year'] );
-	unset( $query_vars['monthnum'] );
-	unset( $query_vars['day'] );
+	unset($query_vars['year']);
+	unset($query_vars['monthnum']);
+	unset($query_vars['day']);
 
 	// Then, set the identified post.
 	$query_vars['name'] = $post->post_name;
@@ -459,7 +459,7 @@ 
  * @param string $url Permalink to check.
  * @return int Post ID, or 0 on failure.
  */
-function url_to_postid( $url ) {
+function url_to_postid($url) {
 	global $wp_rewrite;
 
 	/**
@@ -469,12 +469,12 @@ 
 	 *
 	 * @param string $url The URL to derive the post ID from.
 	 */
-	$url = apply_filters( 'url_to_postid', $url );
+	$url = apply_filters('url_to_postid', $url);
 
 	// First, check to see if there is a 'p=N' or 'page_id=N' to match against
-	if ( preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values) )	{
+	if (preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values)) {
 		$id = absint($values[2]);
-		if ( $id )
+		if ($id)
 			return $id;
 	}
 
@@ -487,21 +487,21 @@ 
 	$url = $url_split[0];
 
 	// Set the correct URL scheme.
-	$scheme = parse_url( home_url(), PHP_URL_SCHEME );
-	$url = set_url_scheme( $url, $scheme );
+	$scheme = parse_url(home_url(), PHP_URL_SCHEME);
+	$url = set_url_scheme($url, $scheme);
 
 	// Add 'www.' if it is absent and should be there
-	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') )
+	if (false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.'))
 		$url = str_replace('://', '://www.', $url);
 
 	// Strip 'www.' if it is present and shouldn't be
-	if ( false === strpos(home_url(), '://www.') )
+	if (false === strpos(home_url(), '://www.'))
 		$url = str_replace('://www.', '://', $url);
 
-	if ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) {
-		$page_on_front = get_option( 'page_on_front' );
+	if (trim($url, '/') === home_url() && 'page' == get_option('show_on_front')) {
+		$page_on_front = get_option('page_on_front');
 
-		if ( $page_on_front && get_post( $page_on_front ) instanceof WP_Post ) {
+		if ($page_on_front && get_post($page_on_front) instanceof WP_Post) {
 			return (int) $page_on_front;
 		}
 	}
@@ -510,21 +510,21 @@ 
 	$rewrite = $wp_rewrite->wp_rewrite_rules();
 
 	// Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options
-	if ( empty($rewrite) )
+	if (empty($rewrite))
 		return 0;
 
 	// Strip 'index.php/' if we're not using path info permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	if ( ! $wp_rewrite->using_index_permalinks())
+		$url = str_replace($wp_rewrite->index.'/', '', $url);
 
-	if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
+	if (false !== strpos(trailingslashit($url), home_url('/'))) {
 		// Chop off http://domain.com/[path]
 		$url = str_replace(home_url(), '', $url);
 	} else {
 		// Chop off /path/to/blog
-		$home_path = parse_url( home_url( '/' ) );
-		$home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
-		$url = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );
+		$home_path = parse_url(home_url('/'));
+		$home_path = isset($home_path['path']) ? $home_path['path'] : '';
+		$url = preg_replace(sprintf('#^%s#', preg_quote($home_path)), '', trailingslashit($url));
 	}
 
 	// Trim leading and lagging slashes
@@ -533,32 +533,32 @@ 
 	$request = $url;
 	$post_type_query_vars = array();
 
-	foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
-		if ( ! empty( $t->query_var ) )
-			$post_type_query_vars[ $t->query_var ] = $post_type;
+	foreach (get_post_types(array(), 'objects') as $post_type => $t) {
+		if ( ! empty($t->query_var))
+			$post_type_query_vars[$t->query_var] = $post_type;
 	}
 
 	// Look for matches.
 	$request_match = $request;
-	foreach ( (array)$rewrite as $match => $query) {
+	foreach ((array) $rewrite as $match => $query) {
 
 		// If the requesting file is the anchor of the match, prepend it
 		// to the path info.
-		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
-			$request_match = $url . '/' . $request;
+		if ( ! empty($url) && ($url != $request) && (strpos($match, $url) === 0))
+			$request_match = $url.'/'.$request;
 
-		if ( preg_match("#^$match#", $request_match, $matches) ) {
+		if (preg_match("#^$match#", $request_match, $matches)) {
 
-			if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+			if ($wp_rewrite->use_verbose_page_rules && preg_match('/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch)) {
 				// This is a verbose page match, let's check to be sure about it.
-				$page = get_page_by_path( $matches[ $varmatch[1] ] );
-				if ( ! $page ) {
+				$page = get_page_by_path($matches[$varmatch[1]]);
+				if ( ! $page) {
 					continue;
 				}
 
-				$post_status_obj = get_post_status_object( $page->post_status );
+				$post_status_obj = get_post_status_object($page->post_status);
 				if ( ! $post_status_obj->public && ! $post_status_obj->protected
-					&& ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+					&& ! $post_status_obj->private && $post_status_obj->exclude_from_search) {
 					continue;
 				}
 			}
@@ -572,12 +572,12 @@ 
 
 			// Filter out non-public query vars
 			global $wp;
-			parse_str( $query, $query_vars );
+			parse_str($query, $query_vars);
 			$query = array();
-			foreach ( (array) $query_vars as $key => $value ) {
-				if ( in_array( $key, $wp->public_query_vars ) ){
+			foreach ((array) $query_vars as $key => $value) {
+				if (in_array($key, $wp->public_query_vars)) {
 					$query[$key] = $value;
-					if ( isset( $post_type_query_vars[$key] ) ) {
+					if (isset($post_type_query_vars[$key])) {
 						$query['post_type'] = $post_type_query_vars[$key];
 						$query['name'] = $value;
 					}
@@ -585,11 +585,11 @@ 
 			}
 
 			// Resolve conflicts between posts with numeric slugs and date archive queries.
-			$query = wp_resolve_numeric_slug_conflicts( $query );
+			$query = wp_resolve_numeric_slug_conflicts($query);
 
 			// Do the query
-			$query = new WP_Query( $query );
-			if ( ! empty( $query->posts ) && $query->is_singular )
+			$query = new WP_Query($query);
+			if ( ! empty($query->posts) && $query->is_singular)
 				return $query->post->ID;
 			else
 				return 0;

Braces +35 added lines, -24 removed lines

@@ -158,8 +158,9 @@ 
  */
 function add_rewrite_tag( $tag, $regex, $query = '' ) {
 	// validate the tag's name
-	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' )
-		return;
+	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' ) {
+			return;
+	}
 
 	global $wp_rewrite, $wp;
 
@@ -203,10 +204,12 @@ 
 	global $wp_rewrite;
 
 	// backwards compatibility for the old parameters: $with_front and $ep_mask
-	if ( ! is_array( $args ) )
-		$args = array( 'with_front' => $args );
-	if ( func_num_args() == 4 )
-		$args['ep_mask'] = func_get_arg( 3 );
+	if ( ! is_array( $args ) ) {
+			$args = array( 'with_front' => $args );
+	}
+	if ( func_num_args() == 4 ) {
+			$args['ep_mask'] = func_get_arg( 3 );
+	}
 
 	$wp_rewrite->add_permastruct( $name, $struct, $args );
 }
@@ -474,8 +477,9 @@ 
 	// First, check to see if there is a 'p=N' or 'page_id=N' to match against
 	if ( preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values) )	{
 		$id = absint($values[2]);
-		if ( $id )
-			return $id;
+		if ( $id ) {
+					return $id;
+		}
 	}
 
 	// Get rid of the #anchor
@@ -491,12 +495,14 @@ 
 	$url = set_url_scheme( $url, $scheme );
 
 	// Add 'www.' if it is absent and should be there
-	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') )
-		$url = str_replace('://', '://www.', $url);
+	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') ) {
+			$url = str_replace('://', '://www.', $url);
+	}
 
 	// Strip 'www.' if it is present and shouldn't be
-	if ( false === strpos(home_url(), '://www.') )
-		$url = str_replace('://www.', '://', $url);
+	if ( false === strpos(home_url(), '://www.') ) {
+			$url = str_replace('://www.', '://', $url);
+	}
 
 	if ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) {
 		$page_on_front = get_option( 'page_on_front' );
@@ -510,12 +516,14 @@ 
 	$rewrite = $wp_rewrite->wp_rewrite_rules();
 
 	// Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options
-	if ( empty($rewrite) )
-		return 0;
+	if ( empty($rewrite) ) {
+			return 0;
+	}
 
 	// Strip 'index.php/' if we're not using path info permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	if ( !$wp_rewrite->using_index_permalinks() ) {
+			$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	}
 
 	if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
 		// Chop off http://domain.com/[path]
@@ -534,8 +542,9 @@ 
 	$post_type_query_vars = array();
 
 	foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
-		if ( ! empty( $t->query_var ) )
-			$post_type_query_vars[ $t->query_var ] = $post_type;
+		if ( ! empty( $t->query_var ) ) {
+					$post_type_query_vars[ $t->query_var ] = $post_type;
+		}
 	}
 
 	// Look for matches.
@@ -544,8 +553,9 @@ 
 
 		// If the requesting file is the anchor of the match, prepend it
 		// to the path info.
-		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
-			$request_match = $url . '/' . $request;
+		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) ) {
+					$request_match = $url . '/' . $request;
+		}
 
 		if ( preg_match("#^$match#", $request_match, $matches) ) {
 
@@ -589,10 +599,11 @@ 
 
 			// Do the query
 			$query = new WP_Query( $query );
-			if ( ! empty( $query->posts ) && $query->is_singular )
-				return $query->post->ID;
-			else
-				return 0;
+			if ( ! empty( $query->posts ) && $query->is_singular ) {
+							return $query->post->ID;
+			} else {
+							return 0;
+			}
 		}
 	}
 	return 0;

src/wp-includes/category.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Taxonomy API: Core category-specific functionality
- *
- * @package WordPress
- * @subpackage Taxonomy
- */
+	 * Taxonomy API: Core category-specific functionality
+	 *
+	 * @package WordPress
+	 * @subpackage Taxonomy
+	 */
 
 /**
  * Retrieve list of category objects.

Spacing +65 added lines, -65 removed lines

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

Braces +12 added lines, -8 removed lines

@@ -90,8 +90,9 @@ 
 function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
 	$category = get_term( $category, 'category', $output, $filter );
 
-	if ( is_wp_error( $category ) )
-		return $category;
+	if ( is_wp_error( $category ) ) {
+			return $category;
+	}
 
 	_make_cat_compat( $category );
 
@@ -170,8 +171,9 @@ 
  */
 function get_category_by_slug( $slug  ) {
 	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+	if ( $category ) {
+			_make_cat_compat( $category );
+	}
 
 	return $category;
 }
@@ -186,8 +188,9 @@ 
  */
 function get_cat_ID( $cat_name ) {
 	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
-		return $cat->term_id;
+	if ( $cat ) {
+			return $cat->term_id;
+	}
 	return 0;
 }
 
@@ -202,8 +205,9 @@ 
 function get_cat_name( $cat_id ) {
 	$cat_id = (int) $cat_id;
 	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
-		return '';
+	if ( ! $category || is_wp_error( $category ) ) {
+			return '';
+	}
 	return $category->name;
 }