<!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>[16699] trunk: s/occured/occurred/.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16699">16699</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-02 23:30:21 +0000 (Thu, 02 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>s/occured/occurred/. props aldenta, fixes <a href="http://trac.wordpress.org/ticket/15653">#15653</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesclasssimplepiephp">trunk/wp-includes/class-simplepie.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16698 => 16699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php        2010-12-02 23:16:04 UTC (rev 16698)
+++ trunk/wp-admin/admin-ajax.php        2010-12-02 23:30:21 UTC (rev 16699)
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx">         $tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
</span><span class="cx"> 
</span><span class="cx">         if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
</span><del>-                $message = __('An error has occured. Please reload the page and try again.');
</del><ins>+                $message = __('An error has occurred. Please reload the page and try again.');
</ins><span class="cx">                 if ( is_wp_error($tag) &amp;&amp; $tag-&gt;get_error_message() )
</span><span class="cx">                         $message = $tag-&gt;get_error_message();
</span><span class="cx"> 
</span><span class="lines">@@ -1343,7 +1343,7 @@
</span><span class="cx">         $sidebar_id = $_POST['sidebar'];
</span><span class="cx">         $multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
</span><span class="cx">         $settings = isset($_POST['widget-' . $id_base]) &amp;&amp; is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
</span><del>-        $error = '&lt;p&gt;' . __('An error has occured. Please reload the page and try again.') . '&lt;/p&gt;';
</del><ins>+        $error = '&lt;p&gt;' . __('An error has occurred. Please reload the page and try again.') . '&lt;/p&gt;';
</ins><span class="cx"> 
</span><span class="cx">         $sidebars = wp_get_sidebars_widgets();
</span><span class="cx">         $sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (16698 => 16699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php        2010-12-02 23:16:04 UTC (rev 16698)
+++ trunk/wp-admin/includes/class-wp-upgrader.php        2010-12-02 23:30:21 UTC (rev 16699)
</span><span class="lines">@@ -1081,7 +1081,7 @@
</span><span class="cx"> 
</span><span class="cx">         function add_strings() {
</span><span class="cx">                 $this-&gt;upgrader-&gt;strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
</span><del>-                $this-&gt;upgrader-&gt;strings['skin_update_failed_error'] = __('An error occured while updating %1$s: &lt;strong&gt;%2$s&lt;/strong&gt;.');
</del><ins>+                $this-&gt;upgrader-&gt;strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: &lt;strong&gt;%2$s&lt;/strong&gt;.');
</ins><span class="cx">                 $this-&gt;upgrader-&gt;strings['skin_update_failed'] = __('The update of %1$s failed.');
</span><span class="cx">                 $this-&gt;upgrader-&gt;strings['skin_update_successful'] = __('%1$s updated successfully.').' &lt;a onclick=&quot;%2$s&quot; href=&quot;#&quot; class=&quot;hide-if-no-js&quot;&gt;&lt;span&gt;'.__('Show Details').'&lt;/span&gt;&lt;span class=&quot;hidden&quot;&gt;'.__('Hide Details').'&lt;/span&gt;.&lt;/a&gt;';
</span><span class="cx">                 $this-&gt;upgrader-&gt;strings['skin_upgrade_end'] = __('All updates have been completed.');
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (16698 => 16699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php        2010-12-02 23:16:04 UTC (rev 16698)
+++ trunk/wp-admin/includes/theme.php        2010-12-02 23:30:21 UTC (rev 16699)
</span><span class="lines">@@ -389,11 +389,11 @@
</span><span class="cx">         if ( ! $res ) {
</span><span class="cx">                 $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' =&gt; array('action' =&gt; $action, 'request' =&gt; serialize($args))) );
</span><span class="cx">                 if ( is_wp_error($request) ) {
</span><del>-                        $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occured during the API request.&lt;/p&gt; &lt;p&gt;&lt;a href=&quot;?&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;Try again&lt;/a&gt;'), $request-&gt;get_error_message() );
</del><ins>+                        $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.&lt;/p&gt; &lt;p&gt;&lt;a href=&quot;?&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;Try again&lt;/a&gt;'), $request-&gt;get_error_message() );
</ins><span class="cx">                 } else {
</span><span class="cx">                         $res = unserialize($request['body']);
</span><span class="cx">                         if ( ! $res )
</span><del>-                        $res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']);
</del><ins>+                        $res = new WP_Error('themes_api_failed', __('An unknown error occurred'), $request['body']);
</ins><span class="cx">                 }
</span><span class="cx">         }
</span><span class="cx">         //var_dump(array($args, $res));
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (16698 => 16699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php        2010-12-02 23:16:04 UTC (rev 16698)
+++ trunk/wp-app.php        2010-12-02 23:30:21 UTC (rev 16699)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx">                 $filetype = wp_check_filetype($location);
</span><span class="cx"> 
</span><span class="cx">                 if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
</span><del>-                        $this-&gt;internal_error(__('Error ocurred while accessing post metadata for file location.'));
</del><ins>+                        $this-&gt;internal_error(__('Error occurred while accessing post metadata for file location.'));
</ins><span class="cx"> 
</span><span class="cx">                 // delete file
</span><span class="cx">                 @unlink($location);
</span><span class="lines">@@ -749,7 +749,7 @@
</span><span class="cx">                 $filetype = wp_check_filetype($location);
</span><span class="cx"> 
</span><span class="cx">                 if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
</span><del>-                        $this-&gt;internal_error(__('Error ocurred while accessing post metadata for file location.'));
</del><ins>+                        $this-&gt;internal_error(__('Error occurred while accessing post metadata for file location.'));
</ins><span class="cx"> 
</span><span class="cx">                 status_header('200');
</span><span class="cx">                 header('Content-Type: ' . $entry['post_mime_type']);
</span><span class="lines">@@ -801,7 +801,7 @@
</span><span class="cx">                 $location = &quot;{$upload_dir['basedir']}/{$location}&quot;;
</span><span class="cx"> 
</span><span class="cx">                 if (!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
</span><del>-                        $this-&gt;internal_error(__('Error ocurred while accessing post metadata for file location.'));
</del><ins>+                        $this-&gt;internal_error(__('Error occurred while accessing post metadata for file location.'));
</ins><span class="cx"> 
</span><span class="cx">                 $fp = fopen(&quot;php://input&quot;, &quot;rb&quot;);
</span><span class="cx">                 $localfp = fopen($location, &quot;w+&quot;);
</span></span></pre></div>
<a id="trunkwpincludesclasssimplepiephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-simplepie.php (16698 => 16699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-simplepie.php        2010-12-02 23:16:04 UTC (rev 16698)
+++ trunk/wp-includes/class-simplepie.php        2010-12-02 23:30:21 UTC (rev 16699)
</span><span class="lines">@@ -1831,7 +1831,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><del>-         * Return the error message for the occured error
</del><ins>+         * Return the error message for the occurred error
</ins><span class="cx">          *
</span><span class="cx">          * @access public
</span><span class="cx">          * @return string Error message
</span></span></pre>
</div>
</div>

</body>
</html>