summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc4
-rw-r--r--includes/common.inc4
-rw-r--r--includes/database.pgsql.inc2
-rw-r--r--includes/file.inc8
-rw-r--r--includes/form.inc4
-rw-r--r--includes/install.inc2
-rw-r--r--includes/session.inc2
-rw-r--r--includes/theme.inc2
-rw-r--r--includes/xmlrpc.inc2
-rw-r--r--includes/xmlrpcs.inc2
10 files changed, 16 insertions, 16 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 0be9f92fa..0d2fc1f9e 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -284,7 +284,7 @@ function cache_get($key) {
$cache->data = db_decode_blob($cache->data);
}
// If enforcing a minimum cache lifetime, validate that the data is
- // currenly valid for this user before we return it by making sure the
+ // currently valid for this user before we return it by making sure the
// cache entry was created before the timestamp in the current session's
// cache timer. The cache variable is loaded into the $user object by
// sess_read() in session.inc.
@@ -735,7 +735,7 @@ function _drupal_bootstrap($phase) {
/**
* Enables use of the theme system without requiring database access. Since
* there is not database access no theme will be enabled and the default
- * themable fuctions will be called. Some themable functions can not be used
+ * themeable functions will be called. Some themeable functions can not be used
* without the full Drupal API loaded. For example, theme_page() is
* unavailable and theme_maintenance_page() must be used in its place.
*/
diff --git a/includes/common.inc b/includes/common.inc
index 5ffaa4444..f02911b44 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -266,7 +266,7 @@ function drupal_not_found() {
$return = menu_execute_active_handler();
}
else {
- // Redirect to a non-existant menu item to make possible tabs disappear.
+ // Redirect to a non-existent menu item to make possible tabs disappear.
menu_set_active_item('');
}
@@ -294,7 +294,7 @@ function drupal_access_denied() {
$return = menu_execute_active_handler();
}
else {
- // Redirect to a non-existant menu item to make possible tabs disappear.
+ // Redirect to a non-existent menu item to make possible tabs disappear.
menu_set_active_item('');
}
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index cf3d05dfb..007d825a0 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -336,7 +336,7 @@ function db_lock_table($table) {
/**
* Unlock all locked tables.
- * This function automatically commits a transation.
+ * This function automatically commits a transaction.
*/
function db_unlock_tables() {
db_query('COMMIT');
diff --git a/includes/file.inc b/includes/file.inc
index 35eb8fb2c..6ce6ac503 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -79,7 +79,7 @@ function file_create_path($dest = 0) {
* if it does not exist or made writable if it is read-only.
* @param $form_item An optional string containing the name of a form item that
* any errors will be attached to. This is useful for settings forms that
- * require the user to specify a writeable directory. If it can't be made to
+ * require the user to specify a writable directory. If it can't be made to
* work, a form error will be set preventing them from saving the settings.
* @return False when directory not found, or true when directory exists.
*/
@@ -120,7 +120,7 @@ function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
*
* @param $path A string containing a file path. This will be set to the
* directory's path.
- * @return If the directory is not in a Drupal writeable directory, FALSE is
+ * @return If the directory is not in a Drupal writable directory, FALSE is
* returned. Otherwise, the base name of the path is returned.
*/
function file_check_path(&$path) {
@@ -481,7 +481,7 @@ function file_save_upload($source, $dest = false, $replace = FILE_EXISTS_RENAME)
if ($file = file_check_upload($source)) {
// This should be refactored, file_check_upload has already
- // moved the file to the temprary folder.
+ // moved the file to the temporary folder.
if (!$dest) {
$dest = file_directory_temp();
$temporary = 1;
@@ -578,7 +578,7 @@ function file_download() {
$args = func_get_args();
$filepath = implode('/', $args);
- // Maintain compatability with old ?file=paths saved in node bodies.
+ // Maintain compatibility with old ?file=paths saved in node bodies.
if (isset($_GET['file'])) {
$filepath = $_GET['file'];
}
diff --git a/includes/form.inc b/includes/form.inc
index f22d06526..7937b860d 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -573,7 +573,7 @@ function form_select_options($element, $choices = NULL) {
if (!isset($choices)) {
$choices = $element['#options'];
}
- // array_key_exists() accomodates the rare event where $element['#value'] is NULL.
+ // array_key_exists() accommodates the rare event where $element['#value'] is NULL.
// isset() fails in this situation.
$value_valid = isset($element['#value']) || array_key_exists('#value', $element);
$value_is_array = is_array($element['#value']);
@@ -937,7 +937,7 @@ function theme_textfield($element) {
* A themed HTML string representing the form.
*/
function theme_form($element) {
- // Anonymous div to satisfy XHTML compliancy.
+ // Anonymous div to satisfy XHTML compliance.
$action = $element['#action'] ? 'action="' . check_url($element['#action']) . '" ' : '';
return '<form '. $action . ' method="'. $element['#method'] .'" '. 'id="'. $element['#id'] .'"'. drupal_attributes($element['#attributes']) .">\n<div>". $element['#children'] ."\n</div></form>\n";
}
diff --git a/includes/install.inc b/includes/install.inc
index b9db13c97..cff01f798 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -18,7 +18,7 @@ foreach (module_list() as $module) {
/**
- * Returns an array of availiable schema versions for a module.
+ * Returns an array of available schema versions for a module.
*
* @param $module
* A module name.
diff --git a/includes/session.inc b/includes/session.inc
index 73b103082..bd25ed69b 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -56,7 +56,7 @@ function sess_write($key, $value) {
// Only save session data when when the browser sends a cookie. This keeps
// crawlers out of session table. This improves speed up queries, reduces
// memory, and gives more useful statistics. We can't eliminate anonymous
- // session table rows without breaking throttle modulee and "Who's Online"
+ // session table rows without breaking throttle module and "Who's Online"
// block.
if ($user->uid || $value || count($_COOKIE)) {
db_query("INSERT INTO {sessions} (sid, uid, cache, hostname, session, timestamp) VALUES ('%s', %d, %d, '%s', '%s', %d)", $key, $user->uid, $user->cache, $_SERVER["REMOTE_ADDR"], $value, time());
diff --git a/includes/theme.inc b/includes/theme.inc
index 356018c7a..610865a60 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -365,7 +365,7 @@ function theme_get_styles() {
*/
/**
- * Format a dynamic text string for emphasised display in a placeholder.
+ * Format a dynamic text string for emphasized display in a placeholder.
*
* E.g. t('Added term %term', array('%term' => theme('placeholder', $term)))
*
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index fae8b1c1f..c1cf22d30 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -257,7 +257,7 @@ function xmlrpc_message_tag_close($parser, $tag) {
}
}
else {
- // Just add as a paramater
+ // Just add as a parameter
$xmlrpc_message->params[] = $value;
}
}
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index e6851a30b..a2e2176b3 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -231,7 +231,7 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) {
// Perform the callback and send the response
/*
if (count($args) == 1) {
- // If only one paramater just send that instead of the whole array
+ // If only one parameter just send that instead of the whole array
$args = $args[0];
}
*/