WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/occured/occurred/. props aldenta, fixes #15653. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-02 23:30:21 +00:00
parent 562c038e71
commit 8d9cf65725
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/admin-ajax.php
View File

@ -508,7 +508,7 @@ case 'add-tag' :
$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST ); $tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) { if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
$message = __('An error has occured. Please reload the page and try again.'); $message = __('An error has occurred. Please reload the page and try again.');
if ( is_wp_error($tag) && $tag->get_error_message() ) if ( is_wp_error($tag) && $tag->get_error_message() )
$message = $tag->get_error_message(); $message = $tag->get_error_message();
@ -1343,7 +1343,7 @@ case 'save-widget' :
$sidebar_id = $_POST['sidebar']; $sidebar_id = $_POST['sidebar'];
$multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0; $multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
$settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false; $settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
$error = '<p>' . __('An error has occured. Please reload the page and try again.') . '</p>'; $error = '<p>' . __('An error has occurred. Please reload the page and try again.') . '</p>';
$sidebars = wp_get_sidebars_widgets(); $sidebars = wp_get_sidebars_widgets();
$sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array(); $sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();

2
wp-admin/includes/class-wp-upgrader.php
View File

@ -1081,7 +1081,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
function add_strings() { function add_strings() {
$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.'); $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
$this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: <strong>%2$s</strong>.'); $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>.');
$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.'); $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
$this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>'; $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';
$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.'); $this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');

4
wp-admin/includes/theme.php
View File

@ -389,11 +389,11 @@ function themes_api($action, $args = null) {
if ( ! $res ) { if ( ! $res ) {
$request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) ); $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
if ( is_wp_error($request) ) { if ( is_wp_error($request) ) {
$res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occured during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() ); $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
} else { } else {
$res = unserialize($request['body']); $res = unserialize($request['body']);
if ( ! $res ) if ( ! $res )
$res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']); $res = new WP_Error('themes_api_failed', __('An unknown error occurred'), $request['body']);
} }
} }
//var_dump(array($args, $res)); //var_dump(array($args, $res));

6
wp-app.php
View File

@ -712,7 +712,7 @@ EOD;
$filetype = wp_check_filetype($location); $filetype = wp_check_filetype($location);
if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) ) if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
$this->internal_error(__('Error ocurred while accessing post metadata for file location.')); $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
// delete file // delete file
@unlink($location); @unlink($location);
@ -749,7 +749,7 @@ EOD;
$filetype = wp_check_filetype($location); $filetype = wp_check_filetype($location);
if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) ) if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
$this->internal_error(__('Error ocurred while accessing post metadata for file location.')); $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
status_header('200'); status_header('200');
header('Content-Type: ' . $entry['post_mime_type']); header('Content-Type: ' . $entry['post_mime_type']);
@ -801,7 +801,7 @@ EOD;
$location = "{$upload_dir['basedir']}/{$location}"; $location = "{$upload_dir['basedir']}/{$location}";
if (!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext'])) if (!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
$this->internal_error(__('Error ocurred while accessing post metadata for file location.')); $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
$fp = fopen("php://input", "rb"); $fp = fopen("php://input", "rb");
$localfp = fopen($location, "w+"); $localfp = fopen($location, "w+");

2
wp-includes/class-simplepie.php
View File

@ -1831,7 +1831,7 @@ class SimplePie
} }
/** /**
* Return the error message for the occured error * Return the error message for the occurred error
* *
* @access public * @access public
* @return string Error message * @return string Error message