<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13054] trunk: Fix typos.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13054">13054</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-11 16:58:32 +0000 (Thu, 11 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix typos. Fix assignment. Remove passing of non-existent arg. Props ScottMac. fixes <a href="http://trac.wordpress.org/ticket/12193">#12193</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (13053 => 13054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php        2010-02-11 16:17:12 UTC (rev 13053)
+++ trunk/wp-app.php        2010-02-11 16:58:32 UTC (rev 13054)
</span><span class="lines">@@ -1580,7 +1580,7 @@
</span><span class="cx">                         return false;
</span><span class="cx"> 
</span><span class="cx">                 if ($match[3] == 'Z')
</span><del>-                        $match[3] == '+0000';
</del><ins>+                        $match[3] = '+0000';
</ins><span class="cx"> 
</span><span class="cx">                 return strtotime($match[1] . &quot; &quot; . $match[2] . &quot; &quot; . $match[3]);
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (13053 => 13054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php        2010-02-11 16:17:12 UTC (rev 13053)
+++ trunk/wp-includes/cache.php        2010-02-11 16:58:32 UTC (rev 13054)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">          * @access private
</span><span class="cx">          * @since 2.0.0
</span><span class="cx">          */
</span><del>-        var $non_existant_objects = array ();
</del><ins>+        var $non_existent_objects = array ();
</ins><span class="cx"> 
</span><span class="cx">         /**
</span><span class="cx">          * The amount of times the cache data was already stored in the cache.
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">                 if (empty ($group))
</span><span class="cx">                         $group = 'default';
</span><span class="cx"> 
</span><del>-                if (false !== $this-&gt;get($id, $group, false))
</del><ins>+                if (false !== $this-&gt;get($id, $group))
</ins><span class="cx">                         return false;
</span><span class="cx"> 
</span><span class="cx">                 return $this-&gt;set($id, $data, $group, $expire);
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">          * by default.
</span><span class="cx">          *
</span><span class="cx">          * On success the group and the id will be added to the
</span><del>-         * $non_existant_objects property in the class.
</del><ins>+         * $non_existent_objects property in the class.
</ins><span class="cx">          *
</span><span class="cx">          * @since 2.0.0
</span><span class="cx">          *
</span><span class="lines">@@ -266,11 +266,11 @@
</span><span class="cx">                 if (empty ($group))
</span><span class="cx">                         $group = 'default';
</span><span class="cx"> 
</span><del>-                if (!$force &amp;&amp; false === $this-&gt;get($id, $group, false))
</del><ins>+                if (!$force &amp;&amp; false === $this-&gt;get($id, $group))
</ins><span class="cx">                         return false;
</span><span class="cx"> 
</span><span class="cx">                 unset ($this-&gt;cache[$group][$id]);
</span><del>-                $this-&gt;non_existant_objects[$group][$id] = true;
</del><ins>+                $this-&gt;non_existent_objects[$group][$id] = true;
</ins><span class="cx">                 return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -294,11 +294,11 @@
</span><span class="cx">          * ID in the cache group. If the cache is hit (success) then the contents
</span><span class="cx">          * are returned.
</span><span class="cx">          *
</span><del>-         * On failure, the $non_existant_objects property is checked and if the
</del><ins>+         * On failure, the $non_existent_objects property is checked and if the
</ins><span class="cx">          * cache group and ID exist in there the cache misses will not be
</span><del>-         * incremented. If not in the nonexistant objects property, then the cache
</del><ins>+         * incremented. If not in the nonexistent objects property, then the cache
</ins><span class="cx">          * misses will be incremented and the cache group and ID will be added to
</span><del>-         * the nonexistant objects.
</del><ins>+         * the nonexistent objects.
</ins><span class="cx">          *
</span><span class="cx">          * @since 2.0.0
</span><span class="cx">          *
</span><span class="lines">@@ -319,10 +319,10 @@
</span><span class="cx">                                 return $this-&gt;cache[$group][$id];
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                if ( isset ($this-&gt;non_existant_objects[$group][$id]) )
</del><ins>+                if ( isset ($this-&gt;non_existent_objects[$group][$id]) )
</ins><span class="cx">                         return false;
</span><span class="cx"> 
</span><del>-                $this-&gt;non_existant_objects[$group][$id] = true;
</del><ins>+                $this-&gt;non_existent_objects[$group][$id] = true;
</ins><span class="cx">                 $this-&gt;cache_misses += 1;
</span><span class="cx">                 return false;
</span><span class="cx">         }
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx">                 if (empty ($group))
</span><span class="cx">                         $group = 'default';
</span><span class="cx"> 
</span><del>-                if (false === $this-&gt;get($id, $group, false))
</del><ins>+                if (false === $this-&gt;get($id, $group))
</ins><span class="cx">                         return false;
</span><span class="cx"> 
</span><span class="cx">                 return $this-&gt;set($id, $data, $group, $expire);
</span><span class="lines">@@ -381,8 +381,8 @@
</span><span class="cx"> 
</span><span class="cx">                 $this-&gt;cache[$group][$id] = $data;
</span><span class="cx"> 
</span><del>-                if(isset($this-&gt;non_existant_objects[$group][$id]))
-                        unset ($this-&gt;non_existant_objects[$group][$id]);
</del><ins>+                if(isset($this-&gt;non_existent_objects[$group][$id]))
+                        unset ($this-&gt;non_existent_objects[$group][$id]);
</ins><span class="cx"> 
</span><span class="cx">                 return true;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>