Fix typos. Fix assignment. Remove passing of non-existent arg. Props ScottMac. fixes WordPress#12193

ryanboren · ryanboren · commit 10221b01f25b · 2010-02-11T16:58:32.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@13054 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-app.php b/wp-app.php
@@ -1580,7 +1580,7 @@ function rfc3339_str2time($str) {
 			return false;
 
 		if ($match[3] == 'Z')
-			$match[3] == '+0000';
+			$match[3] = '+0000';
 
 		return strtotime($match[1] . " " . $match[2] . " " . $match[3]);
 	}
diff --git a/wp-includes/cache.php b/wp-includes/cache.php
@@ -199,7 +199,7 @@ class WP_Object_Cache {
 	 * @access private
 	 * @since 2.0.0
 	 */
-	var $non_existant_objects = array ();
+	var $non_existent_objects = array ();
 
 	/**
 	 * The amount of times the cache data was already stored in the cache.
@@ -238,7 +238,7 @@ function add($id, $data, $group = 'default', $expire = '') {
 		if (empty ($group))
 			$group = 'default';
 
-		if (false !== $this->get($id, $group, false))
+		if (false !== $this->get($id, $group))
 			return false;
 
 		return $this->set($id, $data, $group, $expire);
@@ -252,7 +252,7 @@ function add($id, $data, $group = 'default', $expire = '') {
 	 * by default.
 	 *
 	 * On success the group and the id will be added to the
-	 * $non_existant_objects property in the class.
+	 * $non_existent_objects property in the class.
 	 *
 	 * @since 2.0.0
 	 *
@@ -266,11 +266,11 @@ function delete($id, $group = 'default', $force = false) {
 		if (empty ($group))
 			$group = 'default';
 
-		if (!$force && false === $this->get($id, $group, false))
+		if (!$force && false === $this->get($id, $group))
 			return false;
 
 		unset ($this->cache[$group][$id]);
-		$this->non_existant_objects[$group][$id] = true;
+		$this->non_existent_objects[$group][$id] = true;
 		return true;
 	}
 
@@ -294,11 +294,11 @@ function flush() {
 	 * ID in the cache group. If the cache is hit (success) then the contents
 	 * are returned.
 	 *
-	 * On failure, the $non_existant_objects property is checked and if the
+	 * On failure, the $non_existent_objects property is checked and if the
 	 * cache group and ID exist in there the cache misses will not be
-	 * incremented. If not in the nonexistant objects property, then the cache
+	 * incremented. If not in the nonexistent objects property, then the cache
 	 * misses will be incremented and the cache group and ID will be added to
-	 * the nonexistant objects.
+	 * the nonexistent objects.
 	 *
 	 * @since 2.0.0
 	 *
@@ -319,10 +319,10 @@ function get($id, $group = 'default') {
 				return $this->cache[$group][$id];
 		}
 
-		if ( isset ($this->non_existant_objects[$group][$id]) )
+		if ( isset ($this->non_existent_objects[$group][$id]) )
 			return false;
 
-		$this->non_existant_objects[$group][$id] = true;
+		$this->non_existent_objects[$group][$id] = true;
 		$this->cache_misses += 1;
 		return false;
 	}
@@ -343,7 +343,7 @@ function replace($id, $data, $group = 'default', $expire = '') {
 		if (empty ($group))
 			$group = 'default';
 
-		if (false === $this->get($id, $group, false))
+		if (false === $this->get($id, $group))
 			return false;
 
 		return $this->set($id, $data, $group, $expire);
@@ -381,8 +381,8 @@ function set($id, $data, $group = 'default', $expire = '') {
 
 		$this->cache[$group][$id] = $data;
 
-		if(isset($this->non_existant_objects[$group][$id]))
-			unset ($this->non_existant_objects[$group][$id]);
+		if(isset($this->non_existent_objects[$group][$id]))
+			unset ($this->non_existent_objects[$group][$id]);
 
 		return true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1580,7 +1580,7 @@ function rfc3339_str2time($str) {`
`1580`	`1580`	`return false;`
`1581`	`1581`
`1582`	`1582`	`if ($match[3] == 'Z')`
`1583`		`- $match[3] == '+0000';`
	`1583`	`+ $match[3] = '+0000';`
`1584`	`1584`
`1585`	`1585`	`return strtotime($match[1] . " " . $match[2] . " " . $match[3]);`
`1586`	`1586`	`}`