ntwb / wordpress

src/wp-includes/SimplePie/Cache/Memcache.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Caches data to memcache

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 		$this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host'];
 		$this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port'];
 		$this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']);
-		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+		$this->name = $this->options['extras']['prefix'].md5("$name:$type");
 
 		$this->cache = new Memcache();
 		$this->cache->addServer($this->options['host'], (int) $this->options['port']);

src/wp-includes/SimplePie/Cache/MySQL.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Caches data to a MySQL database

Spacing +31 added lines, -31 removed lines

@@ -111,9 +111,9 @@ 
 			return;
 		}
 
-		$this->id = $name . $type;
+		$this->id = $name.$type;
 
-		if (!$query = $this->mysql->query('SHOW TABLES'))
+		if ( ! $query = $this->mysql->query('SHOW TABLES'))
 		{
 			$this->mysql = null;
 			return;
@@ -125,18 +125,18 @@ 
 			$db[] = $row;
 		}
 
-		if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+		if ( ! in_array($this->options['extras']['prefix'].'cache_data', $db))
 		{
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
 			if ($query === false)
 			{
 				$this->mysql = null;
 			}
 		}
 
-		if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+		if ( ! in_array($this->options['extras']['prefix'].'items', $db))
 		{
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
 			if ($query === false)
 			{
 				$this->mysql = null;
@@ -163,7 +163,7 @@ 
 
 			$prepared = self::prepare_simplepie_object_for_cache($data);
 
-			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
 			if ($query->execute())
 			{
@@ -172,46 +172,46 @@ 
 					$items = count($prepared[1]);
 					if ($items)
 					{
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 						$query->bindValue(':items', $items);
 					}
 					else
 					{
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 					}
 
 					$query->bindValue(':data', $prepared[0]);
 					$query->bindValue(':time', time());
 					$query->bindValue(':feed', $this->id);
-					if (!$query->execute())
+					if ( ! $query->execute())
 					{
 						return false;
 					}
 				}
 				else
 				{
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+					$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
 					$query->bindValue(':feed', $this->id);
 					$query->bindValue(':count', count($prepared[1]));
 					$query->bindValue(':data', $prepared[0]);
 					$query->bindValue(':time', time());
-					if (!$query->execute())
+					if ( ! $query->execute())
 					{
 						return false;
 					}
 				}
 
 				$ids = array_keys($prepared[1]);
-				if (!empty($ids))
+				if ( ! empty($ids))
 				{
 					foreach ($ids as $id)
 					{
 						$database_ids[] = $this->mysql->quote($id);
 					}
 
-					$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+					$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed');
 					$query->bindValue(':feed', $this->id);
 
 					if ($query->execute())
@@ -226,17 +226,17 @@ 
 
 						foreach ($new_ids as $new_id)
 						{
-							if (!($date = $prepared[1][$new_id]->get_date('U')))
+							if ( ! ($date = $prepared[1][$new_id]->get_date('U')))
 							{
 								$date = time();
 							}
 
-							$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+							$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
 							$query->bindValue(':feed', $this->id);
 							$query->bindValue(':id', $new_id);
 							$query->bindValue(':data', serialize($prepared[1][$new_id]->data));
 							$query->bindValue(':date', $date);
-							if (!$query->execute())
+							if ( ! $query->execute())
 							{
 								return false;
 							}
@@ -252,13 +252,13 @@ 
 		}
 		else
 		{
-			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
 			if ($query->execute())
 			{
 				if ($query->rowCount() > 0)
 				{
-					$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+					$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
 					$query->bindValue(':feed', $this->id);
@@ -269,7 +269,7 @@ 
 				}
 				else
 				{
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+					$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
 					$query->bindValue(':id', $this->id);
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
@@ -295,7 +295,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && ($row = $query->fetch()))
 		{
@@ -314,19 +314,19 @@ 
 			{
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
 				}
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
 				}
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
 				}
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
 				}
 				else
 				{
@@ -335,10 +335,10 @@ 
 
 				if ($feed !== null)
 				{
-					$sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+					$sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
 					if ($items > 0)
 					{
-						$sql .= ' LIMIT ' . $items;
+						$sql .= ' LIMIT '.$items;
 					}
 
 					$query = $this->mysql->prepare($sql);
@@ -373,7 +373,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && ($time = $query->fetchColumn()))
 		{
@@ -397,7 +397,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+		$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id');
 		$query->bindValue(':time', time());
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && $query->rowCount() > 0)
@@ -422,9 +422,9 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
-		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+		$query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id');
 		$query2->bindValue(':id', $this->id);
 		if ($query->execute() && $query2->execute())
 		{

Braces +15 added lines, -30 removed lines

@@ -104,8 +104,7 @@ 
 		try
 		{
 			$this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-		}
-		catch (PDOException $e)
+		} catch (PDOException $e)
 		{
 			$this->mysql = null;
 			return;
@@ -175,8 +174,7 @@ 
 						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 						$query->bindValue(':items', $items);
-					}
-					else
+					} else
 					{
 						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
@@ -189,8 +187,7 @@ 
 					{
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
 					$query->bindValue(':feed', $this->id);
@@ -243,14 +240,12 @@ 
 						}
 						return true;
 					}
-				}
-				else
+				} else
 				{
 					return true;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
@@ -266,8 +261,7 @@ 
 					{
 						return true;
 					}
-				}
-				else
+				} else
 				{
 					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
 					$query->bindValue(':id', $this->id);
@@ -304,8 +298,7 @@ 
 			if (isset($this->options['items'][0]))
 			{
 				$items = (int) $this->options['items'][0];
-			}
-			else
+			} else
 			{
 				$items = (int) $row[0];
 			}
@@ -315,20 +308,16 @@ 
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-				}
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-				}
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-				}
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
-				}
-				else
+				} else
 				{
 					$feed = null;
 				}
@@ -349,8 +338,7 @@ 
 						{
 							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
 						}
-					}
-					else
+					} else
 					{
 						return false;
 					}
@@ -378,8 +366,7 @@ 
 		if ($query->execute() && ($time = $query->fetchColumn()))
 		{
 			return $time;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -403,8 +390,7 @@ 
 		if ($query->execute() && $query->rowCount() > 0)
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -429,8 +415,7 @@ 
 		if ($query->execute() && $query2->execute())
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

src/wp-includes/SimplePie/Cache/File.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Caches data to the filesystem

src/wp-includes/SimplePie/Cache/Base.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Base for cache objects

src/wp-includes/SimplePie/Restriction.php

Braces +3 added lines, -6 removed lines

@@ -112,8 +112,7 @@ 
 		if ($this->relationship !== null)
 		{
 			return $this->relationship;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -129,8 +128,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -146,8 +144,7 @@ 
 		if ($this->value !== null)
 		{
 			return $this->value;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Category.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Manages all category-related data

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 		if ($this->term !== null)
 		{
 			return $this->term;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -130,8 +129,7 @@ 
 		if ($this->scheme !== null)
 		{
 			return $this->scheme;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -147,8 +145,7 @@ 
 		if ($this->label !== null)
 		{
 			return $this->label;
-		}
-		else
+		} else
 		{
 			return $this->get_term();
 		}

src/wp-includes/SimplePie/Author.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Manages all author-related data

Braces +3 added lines, -6 removed lines

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

src/wp-includes/SimplePie/Registry.php

Spacing +4 added lines, -4 removed lines

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

Braces +1 added lines, -2 removed lines

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

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * API for easily embedding rich media such as videos and images into content.
- *
- * @package WordPress
- * @subpackage Embed
- * @since 2.9.0
- */
+	 * API for easily embedding rich media such as videos and images into content.
+	 *
+	 * @package WordPress
+	 * @subpackage Embed
+	 * @since 2.9.0
+	 */
 class WP_Embed {
 	public $handlers = array();
 	public $post_ID;

Spacing +74 added lines, -74 removed lines

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

Braces +18 added lines, -11 removed lines

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