Commit d967abdf authored by webchick's avatar webchick

Issue #1054848 by barraponto: Fixing common typos through codespell.py.

parent 9c421426
......@@ -1059,7 +1059,7 @@ Drupal 4.5.0, 2004-10-18
- Filter system:
* Added support for using multiple input formats on the site
* Expanded the embedded PHP-code feature so it can be used everywhere
* Added support for role-dependant filtering, through input formats
* Added support for role-dependent filtering, through input formats
- UI translation:
* Managing translations is now completely done through the administration interface
* Added support for importing/exporting gettext .po files
......
......@@ -74,7 +74,7 @@ function authorize_access_allowed() {
global $conf;
// We have to enable the user and system modules, even to check access and
// display errors via the maintainence theme.
// display errors via the maintenance theme.
$module_list['system']['filename'] = 'modules/system/system.module';
$module_list['user']['filename'] = 'modules/user/user.module';
module_list(TRUE, FALSE, FALSE, $module_list);
......
......@@ -2449,7 +2449,7 @@ function drupal_installation_attempted() {
* non-installation time, such as while installing the module from the the
* module administration page.
*
* Example useage:
* Example usage:
* @code
* $t = get_t();
* $translated = $t('translate this');
......
......@@ -3019,7 +3019,7 @@ function drupal_sort_css_js($a, $b) {
* are always groupable, and items of the 'external' type are never groupable.
* This function also ensures that the process of grouping items does not change
* their relative order. This requirement may result in multiple groups for the
* same type, media, and browsers, if needed to accomodate other items in
* same type, media, and browsers, if needed to accommodate other items in
* between.
*
* @param $css
......
......@@ -152,7 +152,7 @@
* }
*
* // $txn goes out of scope here. Unless the transaction was rolled back, it
* // gets automatically commited here.
* // gets automatically committed here.
* }
*
* function my_other_function($id) {
......
......@@ -839,7 +839,7 @@ public function compiled() {
* Executes the DELETE query.
*
* @return
* The return value is dependant on the database connection.
* The return value is dependent on the database connection.
*/
public function execute() {
$values = array();
......
......@@ -119,7 +119,7 @@ public function __destruct() {
try {
$count = $this->query('SELECT COUNT(*) FROM ' . $prefix . '.sqlite_master WHERE type = :type AND name NOT LIKE :pattern', array(':type' => 'table', ':pattern' => 'sqlite_%'))->fetchField();
// We can prune the database file if it doens't have any tables.
// We can prune the database file if it doesn't have any tables.
if ($count == 0) {
// Detach the database.
$this->query('DETACH DATABASE :schema', array(':schema' => $prefix));
......
......@@ -307,7 +307,7 @@ protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE)
* @param $queried_entities
* Associative array of query results, keyed on the entity ID.
* @param $revision_id
* ID of the revision that was loaded, or FALSE if teh most current revision
* ID of the revision that was loaded, or FALSE if the most current revision
* was loaded.
*/
protected function attachLoad(&$queried_entities, $revision_id = FALSE) {
......
......@@ -136,7 +136,7 @@ function _drupal_decode_exception($exception) {
}
/**
* Render an error message for an exception without any possibility of a further exception occuring.
* Render an error message for an exception without any possibility of a further exception occurring.
*
* @param $exception
* The exception object that was thrown.
......
......@@ -919,7 +919,7 @@ function drupal_process_form($form_id, &$form, &$form_state) {
// have set $form_state['cache'] to indicate that the form and form state
// shall be cached. But the form may only be cached if the 'no_cache' property
// is not set to TRUE. Only cache $form as it was prior to form_builder(),
// because form_builder() must run for each request to accomodate new user
// because form_builder() must run for each request to accommodate new user
// input. Rebuilt forms are not cached here, because drupal_rebuild_form()
// already takes care of that.
if (!$form_state['rebuild'] && $form_state['cache'] && empty($form_state['no_cache'])) {
......@@ -1941,7 +1941,7 @@ function _form_builder_handle_input_element($form_id, &$element, &$form_state) {
// drupal_form_submit() must not be able to get around this. Forms that set
// #access=FALSE on an element usually allow access for some users, so forms
// submitted with drupal_form_submit() may bypass access restriction and be
// treated as high-privelege users instead.
// treated as high-privilege users instead.
$process_input = empty($element['#disabled']) && ($form_state['programmed'] || ($form_state['process_input'] && (!isset($element['#access']) || $element['#access'])));
// Set the element's #value property.
......
......@@ -200,7 +200,7 @@ function pager_find_page($element = 0) {
* to theme('pager') will render a pager that correctly corresponds to the
* items being displayed.
*
* If the items being displayed result from a database query peformed using
* If the items being displayed result from a database query performed using
* Drupal's database API, and if you have control over the construction of the
* database query, you do not need to call this function directly; instead, you
* can simply extend the query object with the 'PagerDefault' extender before
......
......@@ -2097,7 +2097,7 @@ function template_preprocess(&$variables, $hook) {
}
/**
* Returns hook-independant variables to template_preprocess().
* Returns hook-independent variables to template_preprocess().
*/
function _template_preprocess_default_variables() {
global $user;
......
......@@ -11,7 +11,7 @@
* @param $var
* The variable to export.
* @param $prefix
* A prefix that will be added at the begining of every lines of the output.
* A prefix that will be added at the beginning of every lines of the output.
* @return
* The variable exported in a way compatible to Drupal's coding standards.
*/
......
......@@ -262,7 +262,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
foreach ($categories as $category) {
$category_name = db_query("SELECT category FROM {contact} WHERE cid = :cid", array(':cid' => $category))->fetchField();
$this->drupalPost('admin/structure/contact/delete/' . $category, array(), t('Delete'));
$this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)), t('Category deleted sucessfully.'));
$this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)), t('Category deleted successfully.'));
}
}
......
......@@ -727,7 +727,7 @@ function field_read_instances($params = array(), $include_additional = array())
* An instance structure.
* @param $field_cleanup
* If TRUE, the field will be deleted as well if its last instance is being
* deleted. If FALSE, it is the caller's responsability to handle the case of
* deleted. If FALSE, it is the caller's responsibility to handle the case of
* fields left without instances. Defaults to TRUE.
*/
function field_delete_instance($instance, $field_cleanup = TRUE) {
......
......@@ -248,7 +248,7 @@ function list_allowed_values($field) {
* Parses a string of 'allowed values' into an array.
*
* @param $string
* The list of allowed values in string format descibed in
* The list of allowed values in string format described in
* list_allowed_values_string().
* @param $field_type
* The field type. Either 'list_number' or 'list_text'.
......
......@@ -303,7 +303,7 @@ class ListFieldUITestCase extends FieldTestCase {
$this->field_name = 'field_list_boolean';
$this->createListField('list_boolean');
// Check that the seperate 'On' and 'Off' form fields work.
// Check that the separate 'On' and 'Off' form fields work.
$on = $this->randomName();
$off = $this->randomName();
$allowed_values = array(1 => $on, 0 => $off);
......
......@@ -17,7 +17,7 @@ function field_ui_help($path, $arg) {
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Planning fields') . '</dt>';
$output .= '<dd>' . t('There are several decisions you will need to make before definining a field for content, comments, etc.:') . '<dl>';
$output .= '<dd>' . t('There are several decisions you will need to make before defining a field for content, comments, etc.:') . '<dl>';
$output .= '<dt>' . t('What the field will be called') . '</dt>';
$output .= '<dd>' . t('A field has a <em>label</em> (the name displayed in the user interface) and a <em>machine name</em> (the name used internally). The label can be changed after you create the field, if needed, but the machine name cannot be changed after you have created the field.') . '</li>';
$output .= '<dt>' . t('What type of data the field will store') . '</dt>';
......
......@@ -1090,7 +1090,7 @@ function filter_dom_serialize($dom_document) {
* throw exceptions.
*
* This function attempts to solve the problem by creating a DocumentFragment
* and immitating the behavior in drupal_get_js(), commenting the CDATA tag.
* and imitating the behavior in drupal_get_js(), commenting the CDATA tag.
*
* @param $dom_document
* The DOMDocument containing the $dom_element.
......
......@@ -215,7 +215,7 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
* Implements hook_entity_info_alter().
*/
function forum_entity_info_alter(&$info) {
// Take over URI constuction for taxonomy terms that are forums.
// Take over URI construction for taxonomy terms that are forums.
if ($vid = variable_get('forum_nav_vocabulary', 0)) {
// Within hook_entity_info(), we can't invoke entity_load() as that would
// cause infinite recursion, so we call taxonomy_vocabulary_get_names()
......
......@@ -1957,7 +1957,7 @@ class NodeBuildContent extends DrupalWebTestCase {
function testNodeRebuildContent() {
$node = $this->drupalCreateNode();
// Set a property in the content array so we can test for its existance later on.
// Set a property in the content array so we can test for its existence later on.
$node->content['test_content_property'] = array('#value' => $this->randomString());
$content = node_build_content($node);
......
......@@ -324,7 +324,7 @@ class OpenIDFunctionalTestCase extends OpenIDWebTestCase {
function addRedirectedIdentity($identity, $version = 2, $local_id = 'http://example.com/xrds', $claimed_id = NULL, $redirects = 0) {
// Set the final destination URL which is the same as the Claimed
// Identifier, we insert the same identifier also to the provider response,
// but provider could futher change the Claimed ID actually (e.g. it could
// but provider could further change the Claimed ID actually (e.g. it could
// add unique fragment).
variable_set('openid_test_redirect_url', $identity);
variable_set('openid_test_response', array('openid.claimed_id' => $identity));
......
......@@ -15,7 +15,7 @@
*
* The parent window is initialized when a page is displayed in which the
* overlay might be required to be displayed, so modules can act here if they
* need to take action to accomodate the possibility of the overlay appearing
* need to take action to accommodate the possibility of the overlay appearing
* within a Drupal page.
*/
function hook_overlay_parent_initialize() {
......
......@@ -399,7 +399,7 @@ class ProfileBlockTestCase extends ProfileTestCase {
}
function testAuthorInformationBlock() {
// Set the block to a region to confirm the block is availble.
// Set the block to a region to confirm the block is available.
$edit = array();
$edit['blocks[profile_author-information][region]'] = 'footer';
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
......
......@@ -332,7 +332,7 @@ class SearchAdvancedSearchForm extends DrupalWebTestCase {
// Assert that the dummy title doesn't equal the real title.
$dummy_title = 'Lorem ipsum';
$this->assertNotEqual($dummy_title, $this->node->title, t("Dummy title doens't equal node title"));
$this->assertNotEqual($dummy_title, $this->node->title, t("Dummy title doesn't equal node title"));
// Search for the dummy title with a GET query.
$this->drupalGet('search/node/' . $dummy_title);
......@@ -584,11 +584,11 @@ class SearchBlockTestCase extends DrupalWebTestCase {
}
function testSearchFormBlock() {
// Set block title to confirm that the interface is availble.
// Set block title to confirm that the interface is available.
$this->drupalPost('admin/structure/block/manage/search/form/configure', array('title' => $this->randomName(8)), t('Save block'));
$this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
// Set the block to a region to confirm block is availble.
// Set the block to a region to confirm block is available.
$edit = array();
$edit['blocks[search_form][region]'] = 'footer';
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
......
......@@ -1446,7 +1446,7 @@ protected function refreshVariables() {
protected function tearDown() {
global $user, $language;
// In case a fatal error occured that was not in the test process read the
// In case a fatal error occurred that was not in the test process read the
// log to pick up any fatal errors.
simpletest_log_read($this->testId, $this->databasePrefix, get_class($this), TRUE);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -272,7 +272,7 @@ function simpletest_log_read($test_id, $prefix, $test_class, $during_test = FALS
DrupalTestCase::insertAssert($test_id, $test_class, FALSE, $match[2], $match[1], $caller);
}
else {
// Unkown format, place the entire message in the log.
// Unknown format, place the entire message in the log.
DrupalTestCase::insertAssert($test_id, $test_class, FALSE, $line, 'Fatal error');
}
$found = TRUE;
......@@ -398,7 +398,7 @@ function simpletest_generate_file($filename, $width, $lines, $type = 'binary-tex
break;
}
}
$text = wordwrap($text, $width - 1, "\n", TRUE) . "\n"; // Add \n for symetrical file.
$text = wordwrap($text, $width - 1, "\n", TRUE) . "\n"; // Add \n for symmetrical file.
// Create filename.
file_put_contents('public://' . $filename . '.txt', $text);
......
......@@ -305,7 +305,7 @@ function simpletest_result_form($form, &$form_state, $test_id) {
);
$form['action']['filter']['#default_value'] = ($filter['fail'] ? 'fail' : 'all');
// Catagorized test classes for to be used with selected filter value.
// Categorized test classes for to be used with selected filter value.
$form['action']['filter_pass'] = array(
'#type' => 'hidden',
'#default_value' => implode(',', $filter['pass']),
......
......@@ -308,15 +308,15 @@ class HookBootExitTestCase extends DrupalWebTestCase {
variable_set('page_cache_invoke_hooks', FALSE);
$this->assertTrue(cache_get(url('', array('absolute' => TRUE)), 'cache_page'), t('Page has been cached.'));
$this->drupalGet('');
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with agressive cache and a cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with agressive cache and a cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with aggressive cache and a cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with aggressive cache and a cached page.'));
// Test with page cache cleared, boot and exit should be called.
$this->assertTrue(db_delete('cache_page')->execute(), t('Page cache cleared.'));
$this->drupalGet('');
$calls++;
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with agressive cache and no cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with agressive cache and no cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with aggressive cache and no cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with aggressive cache and no cached page.'));
}
}
......
......@@ -2096,7 +2096,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
*/
function testCountQueryFieldRemovals() {
// countQuery should remove all fields and expressions, so this can be
// tested by adding a non-existant field and expression: if it ends
// tested by adding a non-existent field and expression: if it ends
// up in the query, an error will be thrown. If not, it will return the
// number of records, which in this case happens to be 4 (there are four
// records in the {test} table).
......
......@@ -1606,7 +1606,7 @@ class FileMoveTest extends FileHookTestCase {
$result = file_move(clone $source, $desired_filepath, FILE_EXISTS_ERROR);
// Check the return status and that the contents changed.
$this->assertTrue($result, t('File moved sucessfully.'));
$this->assertTrue($result, t('File moved successfully.'));
$this->assertFalse(file_exists($source->uri));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.'));
......@@ -1638,7 +1638,7 @@ class FileMoveTest extends FileHookTestCase {
$result = file_move(clone $source, $target->uri, FILE_EXISTS_RENAME);
// Check the return status and that the contents changed.
$this->assertTrue($result, t('File moved sucessfully.'));
$this->assertTrue($result, t('File moved successfully.'));
$this->assertFalse(file_exists($source->uri));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.'));
......@@ -1675,7 +1675,7 @@ class FileMoveTest extends FileHookTestCase {
// Look at the results.
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were overwritten.'));
$this->assertFalse(file_exists($source->uri));
$this->assertTrue($result, t('File moved sucessfully.'));
$this->assertTrue($result, t('File moved successfully.'));
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('move', 'update', 'delete', 'load'));
......@@ -1767,7 +1767,7 @@ class FileCopyTest extends FileHookTestCase {
$result = file_copy(clone $source, $desired_uri, FILE_EXISTS_ERROR);
// Check the return status and that the contents changed.
$this->assertTrue($result, t('File copied sucessfully.'));
$this->assertTrue($result, t('File copied successfully.'));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were copied correctly.'));
// Check that the correct hooks were called.
......@@ -1798,7 +1798,7 @@ class FileCopyTest extends FileHookTestCase {
$result = file_copy(clone $source, $target->uri, FILE_EXISTS_RENAME);
// Check the return status and that the contents changed.
$this->assertTrue($result, t('File copied sucessfully.'));
$this->assertTrue($result, t('File copied successfully.'));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were copied correctly.'));
$this->assertNotEqual($result->uri, $source->uri, t('Returned file path has changed from the original.'));
......@@ -1838,7 +1838,7 @@ class FileCopyTest extends FileHookTestCase {
$result = file_copy(clone $source, $target->uri, FILE_EXISTS_REPLACE);
// Check the return status and that the contents changed.
$this->assertTrue($result, t('File copied sucessfully.'));
$this->assertTrue($result, t('File copied successfully.'));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were overwritten.'));
$this->assertDifferentFile($source, $result);
......@@ -2160,7 +2160,7 @@ class FileValidateTest extends FileHookTestCase {
$file = $this->createFile();
// Empty validators.
$this->assertEqual(file_validate($file, array()), array(), t('Validating an empty array works succesfully.'));
$this->assertEqual(file_validate($file, array()), array(), t('Validating an empty array works successfully.'));
$this->assertFileHooksCalled(array('validate'));
// Use the file_test.module's test validator to ensure that passing tests
......@@ -2245,7 +2245,7 @@ class FileSaveDataTest extends FileHookTestCase {
$contents = $this->randomName(8);
$result = file_save_data($contents, $existing->uri, FILE_EXISTS_RENAME);
$this->assertTrue($result, t("File saved sucessfully."));
$this->assertTrue($result, t("File saved successfully."));
$this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
$this->assertEqual($result->filename, $existing->filename, t("Filename was set to the basename of the source, rather than that of the renamed file."));
......@@ -2273,7 +2273,7 @@ class FileSaveDataTest extends FileHookTestCase {
$contents = $this->randomName(8);
$result = file_save_data($contents, $existing->uri, FILE_EXISTS_REPLACE);
$this->assertTrue($result, t('File saved sucessfully.'));
$this->assertTrue($result, t('File saved successfully.'));
$this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
$this->assertEqual($result->filename, $existing->filename, t('Filename was set to the basename of the existing file, rather than preserving the original name.'));
......
......@@ -599,13 +599,13 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase {
// Exercise various defaults for textboxes and modifications to ensure
// appropriate override and correct behaviour.
$elements = $this->xpath('//label[@for="edit-form-textfield-test-title-and-required"]/child::span[@class="form-required"]/parent::*/following-sibling::input[@id="edit-form-textfield-test-title-and-required"]');
$this->assertTrue(isset($elements[0]), t("Label preceeds textfield, with required marker inside label."));
$this->assertTrue(isset($elements[0]), t("Label precedes textfield, with required marker inside label."));
$elements = $this->xpath('//input[@id="edit-form-textfield-test-no-title-required"]/preceding-sibling::label[@for="edit-form-textfield-test-no-title-required"]/span[@class="form-required"]');
$this->assertTrue(isset($elements[0]), t("Label tag with required marker preceeds required textfield with no title."));
$this->assertTrue(isset($elements[0]), t("Label tag with required marker precedes required textfield with no title."));
$elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="element-invisible"]');
$this->assertTrue(isset($elements[0]), t("Label preceeding field and label class is element-invisible."));
$this->assertTrue(isset($elements[0]), t("Label preceding field and label class is element-invisible."));
$elements = $this->xpath('//input[@id="edit-form-textfield-test-title"]/preceding-sibling::span[@class="form-required"]');
$this->assertFalse(isset($elements[0]), t("No required marker on non-required field."));
......
......@@ -713,7 +713,7 @@ function form_label_test_form() {
);
$form['form_textfield_test_no_title_required'] = array(
'#type' => 'textfield',
// We use an empty title, since not setting #title supresses the label
// We use an empty title, since not setting #title suppresses the label
// and required marker.
'#title' => '',
'#required' => TRUE,
......
......@@ -536,7 +536,7 @@ class MenuRouterTestCase extends DrupalWebTestCase {
}
/**
* Test menu maintainance hooks.
* Test menu maintenance hooks.
*/
function testMenuItemHooks() {
// Create an item.
......
......@@ -171,7 +171,7 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase {
$this->assertUrlInboundAlter('alias/test2', "user/$uid/edit");
$this->assertUrlOutboundAlter("user/$uid/edit", 'alias/test2');
// Test a non-existant user is not altered.
// Test a non-existent user is not altered.
$uid++;
$this->assertUrlInboundAlter("user/$uid", "user/$uid");
$this->assertUrlOutboundAlter("user/$uid", "user/$uid");
......
......@@ -137,7 +137,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
protected function tearDown() {
global $user, $language;
// In case a fatal error occured that was not in the test process read the
// In case a fatal error occurred that was not in the test process read the
// log to pick up any fatal errors.
simpletest_log_read($this->testId, $this->databasePrefix, get_class($this), TRUE);
......
......@@ -4429,7 +4429,7 @@ function hook_menu_site_status_alter(&$menu_site_status, $path) {
/**
* Register information about FileTransfer classes provided by a module.
*
* The FileTransfer class allows transfering files over a specific type of
* The FileTransfer class allows transferring files over a specific type of
* connection. Core provides classes for FTP and SSH. Contributed modules are
* free to extend the FileTransfer base class to add other connection types,
* and if these classes are registered via hook_filetransfer_info(), those
......
......@@ -169,7 +169,7 @@ function __construct($p_tarname, $p_compress = null)
// }}}
/**
* OS independant PHP extension load. Remember to take care
* OS independent PHP extension load. Remember to take care
* on the correct extension name for case sensitive OSes.
* The function is the copy of PEAR::loadExtension().
*
......
......@@ -1816,7 +1816,7 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
$result = token_replace($source, array('node' => $node), array('language' => $language, 'clear' => TRUE));
$result = $this->assertEqual($target, $result, 'Valid tokens replaced while invalid tokens cleared out.');
// Test without using the clear parameter (non-existant token untouched).
// Test without using the clear parameter (non-existent token untouched).
$target .= '[user:name]';
$target .= '[bogus:token]';
$result = token_replace($source, array('node' => $node), array('language' => $language));
......
......@@ -75,7 +75,7 @@
$vocabulary['weight'] = $i;
taxonomy_save_vocabulary($vocabulary);
$parents = array();
// Vocabularies without hierarcy get one term, single parent vocabularies get
// Vocabularies without hierarchy get one term, single parent vocabularies get
// one parent and one child term. Multiple parent vocabularies get three
// terms: t0, t1, t2 where t0 is a parent of both t1 and t2.
for ($j = 0; $j < $vocabulary['hierarchy'] + 1; $j++) {
......
......@@ -124,7 +124,7 @@ function simpletest_script_help() {
--clean Cleans up database tables or directories from previous, failed,
tests and then exits (no tests are run).
--url Immediately preceeds a URL to set the host and path. You will
--url Immediately precedes a URL to set the host and path. You will
need this parameter if Drupal is in a subdirectory on your
localhost and you have not set \$base_url in settings.php. Tests
can be run under SSL by including https:// in the URL.
......
......@@ -456,7 +456,7 @@ function update_check_requirements() {
$output = update_access_denied_page();
}
if (isset($output) && $output) {
// Explictly start a session so that the update.php token will be accepted.
// Explicitly start a session so that the update.php token will be accepted.
drupal_session_start();
// We defer the display of messages until all updates are done.
$progress_page = ($batch = batch_get()) && isset($batch['running']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment