diff options
author | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-04-11 11:33:15 +0000 |
---|---|---|
committer | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-04-11 11:33:15 +0000 |
commit | 70aae83c8ee2a44b2eb880214af50f8052e12bf7 (patch) | |
tree | 7ed206ab5d302d9699cd11e28b6a3bbbd0ac5fdb /update.php | |
parent | 4b87417062261795eb4a2ce5909c2dacc8ce4704 (diff) | |
download | brdo-70aae83c8ee2a44b2eb880214af50f8052e12bf7.tar.gz brdo-70aae83c8ee2a44b2eb880214af50f8052e12bf7.tar.bz2 |
#58166, fixes for typos, patch by Uwe Herrmann
Diffstat (limited to 'update.php')
-rw-r--r-- | update.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/update.php b/update.php index 63e8f4dc1..8dcbf6a13 100644 --- a/update.php +++ b/update.php @@ -458,7 +458,7 @@ function update_progress_page_nojs() { // Error handling: if PHP dies, it will output whatever is in the output // buffer, followed by the error message. ob_start(); - $fallback = '<p class="error">An unrecoverable error has occured. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the <a href="update.php?op=error">update summary</a>.</p><p class="error">'; + $fallback = '<p class="error">An unrecoverable error has occurred. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the <a href="update.php?op=error">update summary</a>.</p><p class="error">'; print theme('maintenance_page', $fallback, FALSE, TRUE); list($percentage, $message) = update_do_updates(); @@ -466,7 +466,7 @@ function update_progress_page_nojs() { $new_op = 'finished'; } - // Updates succesful; remove fallback + // Updates successful; remove fallback ob_end_clean(); } else { @@ -609,7 +609,7 @@ function update_fix_access_table() { /** * Convert a single MySQL table to UTF-8. * - * We change all text columns to their correspending binary type, + * We change all text columns to their corresponding binary type, * then back to text, but with a UTF-8 character set. * See: http://dev.mysql.com/doc/refman/4.1/en/charset-conversion.html */ @@ -654,7 +654,7 @@ function update_convert_table_utf8($table) { } // Some unavoidable errors happen because the database is not yet up-to-date. -// Our custom error handler is not yet installed, so we just surpress them. +// Our custom error handler is not yet installed, so we just suppress them. ini_set('display_errors', FALSE); include_once './includes/bootstrap.inc'; |