diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-12-30 16:43:20 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-12-30 16:43:20 +0000 |
commit | 92a8adea653b29a9e6ee7778e8628f57b959ca4f (patch) | |
tree | 0fd5b18555aff73bfe4bc5aa3479db3090ad4cf8 /includes | |
parent | cac5dd8a66a07887aca4c4730d56978eaf26c70b (diff) | |
download | brdo-92a8adea653b29a9e6ee7778e8628f57b959ca4f.tar.gz brdo-92a8adea653b29a9e6ee7778e8628f57b959ca4f.tar.bz2 |
- Patch #352470 by scor: fixed typos and grammar in comments.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/bootstrap.inc | 2 | ||||
-rw-r--r-- | includes/common.inc | 4 | ||||
-rw-r--r-- | includes/database/database.inc | 6 | ||||
-rw-r--r-- | includes/database/select.inc | 4 | ||||
-rw-r--r-- | includes/file.inc | 2 | ||||
-rw-r--r-- | includes/form.inc | 10 | ||||
-rw-r--r-- | includes/image.inc | 2 | ||||
-rw-r--r-- | includes/install.inc | 2 | ||||
-rw-r--r-- | includes/language.inc | 2 | ||||
-rw-r--r-- | includes/mail.inc | 2 | ||||
-rw-r--r-- | includes/menu.inc | 6 | ||||
-rw-r--r-- | includes/theme.inc | 4 |
12 files changed, 23 insertions, 23 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 4d6c24e07..8b9038474 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1191,7 +1191,7 @@ function drupal_maintenance_theme() { } /** - * Return the name of the localisation function. Use in code that needs to + * Return the name of the localization function. Use in code that needs to * run both during installation and normal operation. */ function get_t() { diff --git a/includes/common.inc b/includes/common.inc index 408fb99e5..1a86ba292 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1900,7 +1900,7 @@ function drupal_eval($code) { $old_theme_path = $theme_path; // Restore theme_path to the theme, as long as drupal_eval() executes, - // so code evaluted will not see the caller module as the current theme. + // so code evaluated will not see the caller module as the current theme. // If theme info is not initialized get the path from theme_default. if (!isset($theme_info)) { $theme_path = drupal_get_path('theme', $conf['theme_default']); @@ -2650,7 +2650,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL) { * * Please note that this function should be called from the theme layer, such as * in a .tpl.php file, theme_ function, or in a template_preprocess function, - * not in a form declartion. Though the same JavaScript could be added to the + * not in a form declaration. Though the same JavaScript could be added to the * page using drupal_add_js() directly, this function helps keep template files * clean and readable. It also prevents tabledrag.js from being added twice * accidentally. diff --git a/includes/database/database.inc b/includes/database/database.inc index 043515548..bd88c220e 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -288,7 +288,7 @@ abstract class DatabaseConnection extends PDO { * * throw_exception - By default, the database system will catch any errors * on a query as an Exception, log it, and then rethrow it so that code - * further up the call chain can take an appropriate action. To supress + * further up the call chain can take an appropriate action. To suppress * that behavior and simply return NULL on failure, set this option to FALSE. * * @return @@ -1950,7 +1950,7 @@ function db_type_placeholder($type) { return '\'%s\''; case 'numeric': - // Numeric values are arbitrary precision numbers. Syntacically, numerics + // Numeric values are arbitrary precision numbers. Syntactically, numerics // should be specified directly in SQL. However, without single quotes // the %s placeholder does not protect against non-numeric characters such // as spaces which would expose us to SQL injection. @@ -2304,7 +2304,7 @@ function _db_query_process_args($query, $args, $options) { $options['target'] = 'default'; } - // Temporary backward-compatibliity hacks. Remove later. + // Temporary backward-compatibility hacks. Remove later. $old_query = $query; $query = str_replace(array('%n', '%d', '%f', '%b', "'%s'", '%s'), '?', $old_query); if ($old_query !== $query) { diff --git a/includes/database/select.inc b/includes/database/select.inc index 687d6f5e7..a8e763146 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -407,7 +407,7 @@ class SelectQuery extends Query implements QueryConditionInterface, QueryAlterab * Adds an expression to the list of "fields" to be SELECTed. * * An expression can be any arbitrary string that is valid SQL. That includes - * various functions, which may in some cases be database-dependant. This + * various functions, which may in some cases be database-dependent. This * method makes no effort to correct for database-specific functions. * * @param $expression @@ -559,7 +559,7 @@ class SelectQuery extends Query implements QueryConditionInterface, QueryAlterab * insert should be passed in the 4th parameter. For the first table joined * on a query, this value is ignored as the first table is taken as the base * table. - * @param $argments + * @param $arguments * An array of arguments to replace into the $condition of this join. * @return * The unique alias that was assigned for this table. diff --git a/includes/file.inc b/includes/file.inc index eb8c075e2..6a0ef2334 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -747,7 +747,7 @@ function file_unmanaged_delete($path) { if (is_file($path)) { return unlink($path); } - // Return TRUE for non-existant file, but log that nothing was actually + // Return TRUE for non-existent file, but log that nothing was actually // deleted, as the current state is the indended result. if (!file_exists($path)) { watchdog('file', 'The file %path was not deleted, because it does not exist.', array('%path' => $path), WATCHDOG_NOTICE); diff --git a/includes/form.inc b/includes/form.inc index b9b2ebf3f..224ada048 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -48,7 +48,7 @@ /** * Retrieves a form from a constructor function, or from the cache if - * the form was built in a previous page-load. The form is then passesed + * the form was built in a previous page-load. The form is then passed * on for processing, after and rendered for display if necessary. * * @param $form_id @@ -399,7 +399,7 @@ function drupal_process_form($form_id, &$form, &$form_state) { // form_clean_id() maintains a cache of element IDs it has seen, // so it can prevent duplicates. We want to be sure we reset that - // cache when a form is processed, so scenerios that result in + // cache when a form is processed, so scenarios that result in // the form being built behind the scenes and again for the // browser don't increment all the element IDs needlessly. form_clean_id(NULL, TRUE); @@ -422,7 +422,7 @@ function drupal_process_form($form_id, &$form, &$form_state) { // drupal_execute). if ($batch =& batch_get() && !isset($batch['current_set'])) { // The batch uses its own copies of $form and $form_state for - // late execution of submit handers and post-batch redirection. + // late execution of submit handlers and post-batch redirection. $batch['form'] = $form; $batch['form_state'] = $form_state; $batch['progressive'] = !$form['#programmed']; @@ -929,7 +929,7 @@ function form_builder($form_id, $form, &$form_state) { // Internet Explorer button-click scenario. _form_builder_ie_cleanup($form, $form_state); - // We shoud keep the buttons array until the IE clean up function + // We should keep the buttons array until the IE clean up function // has recognized the submit button so the form has been marked // as submitted. If we already know which button was submitted, // we don't need the array. @@ -1881,7 +1881,7 @@ function form_process_ahah($element) { // submission via pressing the enter key triggers a click event on // submit inputs, inappropriately triggering AHAH behaviors. $element['#ahah']['event'] = 'mousedown'; - // Attach an additional event handler so that AHAH behaviours + // Attach an additional event handler so that AHAH behaviors // can be triggered still via keyboard input. $element['#ahah']['keypress'] = TRUE; break; diff --git a/includes/image.inc b/includes/image.inc index e9abe5eca..a38e23419 100644 --- a/includes/image.inc +++ b/includes/image.inc @@ -234,7 +234,7 @@ function image_resize($source, $destination, $width, $height) { * @param $degrees * The number of (clockwise) degrees to rotate the image. * @param $background - * An hexidecimal integer specifying the background color to use for the + * An hexadecimal integer specifying the background color to use for the * uncovered area of the image after the rotation. E.g. 0x000000 for black, * 0xff00ff for magenta, and 0xffffff for white. * @return diff --git a/includes/install.inc b/includes/install.inc index eb4f98460..7e822edb1 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -226,7 +226,7 @@ function drupal_detect_database_types() { } } - // Usability: unconditionnally put the MySQL driver on top. + // Usability: unconditionally put the MySQL driver on top. if (isset($databases['mysql'])) { $mysql_database = $databases['mysql']; unset($databases['mysql']); diff --git a/includes/language.inc b/includes/language.inc index 866947ea3..45fbf9c62 100644 --- a/includes/language.inc +++ b/includes/language.inc @@ -99,7 +99,7 @@ function language_from_browser() { } /** - * Rewrite URL's with language based prefix. Parameters are the same + * Rewrite URLs with language based prefix. Parameters are the same * as those of the url() function. */ function language_url_rewrite(&$path, &$options) { diff --git a/includes/mail.inc b/includes/mail.inc index f50e626ec..c686c2078 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -188,7 +188,7 @@ function drupal_mail_send($message) { // They will appear correctly in the actual e-mail that is sent. str_replace("\r", '', $message['body']), // For headers, PHP's API suggests that we use CRLF normally, - // but some MTAs incorrecly replace LF with CRLF. See #234403. + // but some MTAs incorrectly replace LF with CRLF. See #234403. join("\n", $mimeheaders) ); } diff --git a/includes/menu.inc b/includes/menu.inc index 71de4ea98..269955429 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -444,7 +444,7 @@ function _menu_load_objects(&$item, &$map) { foreach ($args as $i => $arg) { if ($arg === '%index') { // Pass on argument index to the load function, so multiple - // occurances of the same placeholder can be identified. + // occurrences of the same placeholder can be identified. $args[$i] = $index; } if ($arg === '%map') { @@ -734,7 +734,7 @@ function _menu_link_translate(&$item) { * infinite recursion. * * @param $type - * Type of the object. These appear in hook_menu definitons as %type. Core + * Type of the object. These appear in hook_menu definitions as %type. Core * provides aggregator_feed, aggregator_category, contact, filter_format, * forum_term, menu, menu_link, node, taxonomy_vocabulary, user. See the * relevant {$type}_load function for more on each. Defaults to node. @@ -2185,7 +2185,7 @@ function _menu_clear_page_cache() { static $cache_cleared = 0; // Clear the page and block caches, but at most twice, including at - // the end of the page load when there are multple links saved or deleted. + // the end of the page load when there are multiple links saved or deleted. if (empty($cache_cleared)) { cache_clear_all(); // Keep track of which menus have expanded items. diff --git a/includes/theme.inc b/includes/theme.inc index 1580a437b..011872842 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1379,7 +1379,7 @@ function theme_table($header, $rows, $attributes = array(), $caption = NULL, $co // Format the table header: if (count($header)) { $ts = tablesort_init($header); - // HTML requires that the thead tag has tr tags in it follwed by tbody + // HTML requires that the thead tag has tr tags in it followed by tbody // tags. Using ternary operator to check and see if we have any rows. $output .= (count($rows) ? ' <thead><tr>' : ' <tr>'); foreach ($header as $cell) { @@ -1816,7 +1816,7 @@ function template_preprocess(&$variables, $hook) { * based on the current path. * * Any changes to variables in this preprocessor should also be changed inside - * template_preprocess_maintenance_page() to keep all them consistent. + * template_preprocess_maintenance_page() to keep all of them consistent. * * The $variables array contains the following arguments: * - $content |