summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-05-07 00:08:36 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-05-07 00:08:36 +0000
commit9cff02e91b43dc978023d6cb35ab12ee8c613bf8 (patch)
tree681a03fe40b520b54fbf41c995ea928d2310edb7 /includes
parentd8d12d901ddb7cbba95d8f0ba533fbec43b191b2 (diff)
downloadbrdo-9cff02e91b43dc978023d6cb35ab12ee8c613bf8.tar.gz
brdo-9cff02e91b43dc978023d6cb35ab12ee8c613bf8.tar.bz2
#61802 by Zen, Double spaced sentences clean up
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc14
-rw-r--r--includes/common.inc16
-rw-r--r--includes/file.inc4
-rw-r--r--includes/form.inc8
-rw-r--r--includes/module.inc2
-rw-r--r--includes/session.inc6
-rw-r--r--includes/theme.inc6
7 files changed, 28 insertions, 28 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 413c863e9..3db7d9fad 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -27,7 +27,7 @@ define('DRUPAL_ANONYMOUS_RID', 1);
define('DRUPAL_AUTHENTICATED_RID', 2);
/**
- * Start the timer with the specified name. If you start and stop
+ * Start the timer with the specified name. If you start and stop
* the same timer multiple times, the measured intervals will be
* accumulated.
*
@@ -66,7 +66,7 @@ function timer_read($name) {
* @param name
* The name of the timer.
* @return
- * A timer array. The array contains the number of times the
+ * A timer array. The array contains the number of times the
* timer has been started and stopped (count) and the accumulated
* timer value in ms (time).
*/
@@ -180,7 +180,7 @@ function conf_init() {
/**
* Returns and optionally sets the filename for a system item (module,
- * theme, etc.). The filename, whether provided, cached, or retrieved
+ * theme, etc.). The filename, whether provided, cached, or retrieved
* from the database, is only returned if the file exists.
*
* @param $type
@@ -333,7 +333,7 @@ function cache_get($key) {
// If enforcing a minimum cache lifetime, validate that the data is
// 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
+ // cache timer. The cache variable is loaded into the $user object by
// sess_read() in session.inc.
else {
if ($user->cache > $cache->created) {
@@ -393,7 +393,7 @@ function cache_clear_all($cid = NULL, $wildcard = false) {
if (empty($cid)) {
if (variable_get('cache_lifetime', 0)) {
// We store the time in the current user's $user->cache variable which
- // will be saved into the sessions table by sess_write(). We then
+ // will be saved into the sessions table by sess_write(). We then
// simulate that the cache was flushed for this user by not returning
// cached data that was cached before the timestamp.
$user->cache = time();
@@ -463,7 +463,7 @@ function bootstrap_invoke_all($hook) {
}
/**
- * Includes a file with the provided type and name. This prevents
+ * Includes a file with the provided type and name. This prevents
* including a theme, engine, module, etc., more than once.
*
* @param $type
@@ -535,7 +535,7 @@ function drupal_page_header() {
header('Content-Encoding: gzip');
}
- // Send the original request's headers. We send them one after
+ // Send the original request's headers. We send them one after
// another so PHP's header() function can deal with duplicate
// headers.
$headers = explode("\n", $cache->headers);
diff --git a/includes/common.inc b/includes/common.inc
index ac500e2c3..4a6447cef 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -46,7 +46,7 @@ function drupal_set_content($region = null, $data = null) {
* Get assigned content.
*
* @param $region
- * A specified region to fetch content for. If null, all regions will be returned.
+ * A specified region to fetch content for. If null, all regions will be returned.
*
* @param $delimiter
* Content to be inserted between exploded array elements.
@@ -198,7 +198,7 @@ function drupal_query_string_encode($query, $exclude = array(), $parent = '') {
* drupal_goto(). Used to direct the user back to the referring page
* after completing a form. By default the current URL is returned.
* If a destination exists in the previous request, that destination
- * is returned. As such, a destination can persist across multiple
+ * is returned. As such, a destination can persist across multiple
* pages.
*
* @see drupal_goto()
@@ -225,13 +225,13 @@ function drupal_get_destination() {
* URL is formatted correctly.
*
* Usually the redirected URL is constructed from this function's input
- * parameters. However you may override that behavior by setting a
+ * parameters. However you may override that behavior by setting a
* <em>destination</em> in either the $_REQUEST-array (i.e. by using
* the query string of an URI) or the $_REQUEST['edit']-array (i.e. by
- * using a hidden form field). This is used to direct the user back to
- * the proper page after completing a form. For example, after editing
+ * using a hidden form field). This is used to direct the user back to
+ * the proper page after completing a form. For example, after editing
* a post on the 'admin/node'-page or after having logged on using the
- * 'user login'-block in a sidebar. The function drupal_get_destination()
+ * 'user login'-block in a sidebar. The function drupal_get_destination()
* can be used to help set the destination URL.
*
* It is advised to use drupal_goto() instead of PHP's header(), because
@@ -675,7 +675,7 @@ function flood_register_event($name) {
* @param $number
* The maximum number of the specified event per hour (per visitor).
* @return
- * True if the user did not exceed the hourly threshold. False otherwise.
+ * True if the user did not exceed the hourly threshold. False otherwise.
*/
function flood_is_allowed($name, $threshold) {
$number = db_num_rows(db_query("SELECT event FROM {flood} WHERE event = '%s' AND hostname = '%s' AND timestamp > %d", $name, $_SERVER['REMOTE_ADDR'], time() - 3600));
@@ -981,7 +981,7 @@ function url($path = NULL, $query = NULL, $fragment = NULL, $absolute = FALSE) {
static $clean_url;
if (empty($script)) {
- // On some web servers, such as IIS, we can't omit "index.php". So, we
+ // On some web servers, such as IIS, we can't omit "index.php". So, we
// generate "index.php?q=foo" instead of "?q=foo" on anything that is not
// Apache.
$script = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === false) ? 'index.php' : '';
diff --git a/includes/file.inc b/includes/file.inc
index 196d6c172..51012e45f 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -322,7 +322,7 @@ function file_copy(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) {
$source = realpath($source);
if (!file_exists($source)) {
- drupal_set_message(t('The selected file %file could not be copied, because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => theme('placeholder', $source))), 'error');
+ drupal_set_message(t('The selected file %file could not be copied, because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => theme('placeholder', $source))), 'error');
return 0;
}
@@ -605,7 +605,7 @@ function file_download() {
* When TRUE, the directory scan will recurse the entire tree
* starting at the provided directory.
* @param $key
- * The key to be used for the returned array of files. Possible
+ * The key to be used for the returned array of files. Possible
* values are "filename", for the path starting with $dir,
* "basename", for the basename of the file, and "name" for the name
* of the file without an extension.
diff --git a/includes/form.inc b/includes/form.inc
index 92d25f4cc..5e0a3a12c 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -50,7 +50,7 @@ function element_children($element) {
*
* @param $form_id
* A unique string identifying the form. Allows each form to be
- * themed. Pass NULL to suppress the form_id parameter (produces
+ * themed. Pass NULL to suppress the form_id parameter (produces
* a shorter URL with method=get)
* @param $form
* An associative array containing the structure of the form.
@@ -169,7 +169,7 @@ function drupal_validate_form($form_id, $form, $callback = NULL) {
if (isset($form['#token'])) {
if ($form_values['form_token'] != md5(session_id() . $form['#token'] . variable_get('drupal_private_key', ''))) {
// setting this error will cause the form to fail validation
- form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.'));
+ form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.'));
}
}
@@ -482,7 +482,7 @@ function _form_set_value(&$form_values, $form, $parents, $value) {
/**
* Renders a HTML form given a form tree. Recursively iterates over each of
* the form elements, generating HTML code. This function is usually
- * called from within a theme. To render a form from within a module, use
+ * called from within a theme. To render a form from within a module, use
* drupal_get_form().
*
* @param $elements
@@ -1013,7 +1013,7 @@ function theme_textfield($element) {
function theme_form($element) {
// 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";
+ 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/module.inc b/includes/module.inc
index 3e05d62a2..5cf5fc464 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -155,7 +155,7 @@ function module_implements($hook, $sort = FALSE) {
}
}
- // The explicit cast forces a copy to be made. This is needed because
+ // The explicit cast forces a copy to be made. This is needed because
// $implementations[$hook] is only a reference to an element of
// $implementations and if there are nested foreaches (due to nested node
// API calls, for example), they would both manipulate the same array's
diff --git a/includes/session.inc b/includes/session.inc
index bd25ed69b..160376d84 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -53,7 +53,7 @@ function sess_write($key, $value) {
$result = db_query("SELECT sid FROM {sessions} WHERE sid = '%s'", $key);
if (!db_num_rows($result)) {
- // Only save session data when when the browser sends a cookie. This keeps
+ // 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 module and "Who's Online"
@@ -80,9 +80,9 @@ function sess_destroy($key) {
function sess_gc($lifetime) {
// Be sure to adjust 'php_value session.gc_maxlifetime' to a large enough
- // value. For example, if you want user sessions to stay in your database
+ // value. For example, if you want user sessions to stay in your database
// for three weeks before deleting them, you need to set gc_maxlifetime
- // to '1814400'. At that value, only after a user doesn't log in after
+ // to '1814400'. At that value, only after a user doesn't log in after
// three weeks (1814400 seconds) will his/her session be removed.
db_query("DELETE FROM {sessions} WHERE timestamp < %d", time() - $lifetime);
diff --git a/includes/theme.inc b/includes/theme.inc
index 91996d2b8..19e0f4b71 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -179,7 +179,7 @@ function theme_get_function($function) {
global $theme, $theme_engine;
// Because theme() is called a lot, calling init_theme() only to have it
- // smartly return is a noticeable performance hit. Don't do it.
+ // smartly return is a noticeable performance hit. Don't do it.
if (!isset($theme)) {
init_theme();
}
@@ -454,7 +454,7 @@ function theme_maintenance_page($content, $messages = TRUE, $partial = FALSE) {
}
/**
- * Returns themed set of status and/or error messages. The messages are grouped
+ * Returns themed set of status and/or error messages. The messages are grouped
* by type.
*
* @return
@@ -725,7 +725,7 @@ function theme_table($header, $rows, $attributes = array(), $caption = NULL) {
* Return a themed sort icon.
*
* @param $style
- * Set to either asc or desc. This sets which icon to show.
+ * Set to either asc or desc. This sets which icon to show.
* @return
* A themed sort icon.
*/