From 9cff02e91b43dc978023d6cb35ab12ee8c613bf8 Mon Sep 17 00:00:00 2001 From: Neil Drumm Date: Sun, 7 May 2006 00:08:36 +0000 Subject: [PATCH] #61802 by Zen, Double spaced sentences clean up --- CHANGELOG.txt | 6 ++-- database/updates.inc | 4 +-- includes/bootstrap.inc | 14 ++++---- includes/common.inc | 16 ++++----- includes/file.inc | 4 +-- includes/form.inc | 8 ++--- includes/module.inc | 2 +- includes/session.inc | 6 ++-- includes/theme.inc | 6 ++-- modules/aggregator.module | 12 +++---- modules/aggregator/aggregator.module | 12 +++---- modules/archive.module | 4 +-- modules/archive/archive.module | 4 +-- modules/block.module | 4 +-- modules/block/block.module | 4 +-- modules/blog.module | 6 ++-- modules/blog/blog.module | 6 ++-- modules/blogapi.module | 2 +- modules/blogapi/blogapi.module | 2 +- modules/book.module | 34 +++++++++---------- modules/book/book.module | 34 +++++++++---------- modules/comment.module | 30 ++++++++-------- modules/comment/comment.module | 30 ++++++++-------- modules/filter.module | 6 ++-- modules/filter/filter.module | 6 ++-- modules/forum.module | 2 +- modules/forum/forum.module | 2 +- modules/help.module | 2 +- modules/help/help.module | 2 +- modules/legacy.module | 6 ++-- modules/legacy/legacy.module | 6 ++-- modules/locale.module | 10 +++--- modules/locale/locale.module | 10 +++--- modules/menu.module | 2 +- modules/menu/menu.module | 2 +- modules/node.module | 8 ++--- modules/node/node.module | 8 ++--- modules/page.module | 8 ++--- modules/page/page.module | 8 ++--- modules/path.module | 14 ++++---- modules/path/path.module | 14 ++++---- modules/ping.module | 2 +- modules/ping/ping.module | 2 +- modules/poll.module | 2 +- modules/poll/poll.module | 2 +- modules/search.module | 4 +-- modules/search/search.module | 4 +-- modules/statistics.module | 4 +-- modules/statistics/statistics.module | 4 +-- modules/story.module | 2 +- modules/story/story.module | 2 +- modules/system.module | 32 ++++++++--------- modules/system/system.module | 32 ++++++++--------- modules/taxonomy.module | 8 ++--- modules/taxonomy/taxonomy.module | 8 ++--- modules/throttle.module | 20 +++++------ modules/throttle/throttle.module | 20 +++++------ modules/tracker.module | 4 +-- modules/tracker/tracker.module | 4 +-- modules/upload.module | 4 +-- modules/upload/upload.module | 4 +-- modules/user.module | 22 ++++++------ modules/user/user.module | 22 ++++++------ modules/watchdog.module | 4 +-- modules/watchdog/watchdog.module | 4 +-- sites/default/settings.php | 2 +- themes/engines/phptemplate/phptemplate.engine | 2 +- update.php | 4 +-- 68 files changed, 295 insertions(+), 295 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fbaa6e00d970..1de9ad1ca6e1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -431,9 +431,9 @@ Drupal 3.0.0, 2001-09-15 - rewrote headline code and renamed it to import.module and export.module: * added various improvements, including a better parser, bundles and better control over individual feeds. - rewrote section code and renamed it to meta.module: - * supports unlimited amount of nested topics. Topics can be nested to create a multi-level hierarchy. + * supports unlimited amount of nested topics. Topics can be nested to create a multi-level hierarchy. - rewrote configuration file resolving: - * Drupal tries to locate a configuration file that matches your domain name or uses conf.php if the former failed. Note also that the configuration files got renamed from .conf to .php for security's sake on mal-configured Drupal sites. + * Drupal tries to locate a configuration file that matches your domain name or uses conf.php if the former failed. Note also that the configuration files got renamed from .conf to .php for security's sake on mal-configured Drupal sites. - added caching support which makes Drupal extremely scalable. - added access.module: * allows you to setup 'roles' (groups) and to bind a set of permissions to each group. @@ -499,7 +499,7 @@ Drupal 2.0.0, 2001-03-15 - added translation / localization / internationalization support: * because many people would love to see their website showing a lot less of English, and far more of their own language, Drupal provides a framework to setup a multi-lingual website or to overwrite the default English text in English. - added fine-grained user permission (or group) system: - * users can be granted access to specific administration sections. Example: a FAQ maintainer can be given access to maintain the FAQ and translators can be given access to the translation pages. + * users can be granted access to specific administration sections. Example: a FAQ maintainer can be given access to maintain the FAQ and translators can be given access to the translation pages. - added FAQ module - changed the "open submission queue" into a (optional) module. - various updates: diff --git a/database/updates.inc b/database/updates.inc index df676513c453..83b23aff38ab 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -288,7 +288,7 @@ function system_update_119() { function system_update_120() { $ret = array(); - // Rewrite old URL aliases. Works for both PostgreSQL and MySQL + // Rewrite old URL aliases. Works for both PostgreSQL and MySQL $result = db_query("SELECT pid, src FROM {url_alias} WHERE src LIKE 'blog/%%'"); while ($alias = db_fetch_object($result)) { list(, $page, $op, $uid) = explode('/', $alias->src); @@ -992,7 +992,7 @@ function system_update_151() { } // Set menu_primary_menu and menu_primary_menu variables if links were - // imported. If the user had links but the toggle display was off, they + // imported. If the user had links but the toggle display was off, they // will need to disable the new links manually in admins/settings/menu. if ($num_inserted == 0) { variable_set($menus[$loop]['menu_var'], 0); diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 413c863e9ad7..3db7d9fadc27 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 ac500e2c37b6..4a6447cef6b3 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 * destination 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 196d6c172cea..51012e45fa77 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 92d25f4cc68d..5e0a3a12c56e 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 '
\n
". $element['#children'] ."\n
\n"; + return '
\n
". $element['#children'] ."\n
\n"; } /** diff --git a/includes/module.inc b/includes/module.inc index 3e05d62a2cca..5cf5fc4641f4 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 bd25ed69bb88..160376d84140 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 91996d2b8bc0..19e0f4b716f7 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. */ diff --git a/modules/aggregator.module b/modules/aggregator.module index abe593497664..21ea91e06307 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -210,7 +210,7 @@ function aggregator_settings() { $form['aggregator_clear'] = array( '#type' => 'select', '#title' => t('Discard news items older than'), '#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period, - '#description' => t('Older news items will be automatically discarded. Requires crontab.') + '#description' => t('Older news items will be automatically discarded. Requires crontab.') ); $form['aggregator_category_selector'] = array( @@ -823,7 +823,7 @@ function aggregator_parse_feed(&$data, $feed) { /* ** We reverse the array such that we store the first item last, - ** and the last item first. In the database, the newest item + ** and the last item first. In the database, the newest item ** should be at the top. */ @@ -838,7 +838,7 @@ function aggregator_parse_feed(&$data, $feed) { } /* - ** Resolve the item's title. If no title is found, we use + ** Resolve the item's title. If no title is found, we use ** up to 40 characters of the description ending at a word ** boundary but not splitting potential entities. */ @@ -875,7 +875,7 @@ function aggregator_parse_feed(&$data, $feed) { } /* - ** Try to resolve and parse the item's publication date. If no + ** Try to resolve and parse the item's publication date. If no ** date is found, we use the current date instead. */ @@ -898,8 +898,8 @@ function aggregator_parse_feed(&$data, $feed) { } /* - ** Save this item. Try to avoid duplicate entries as much as - ** possible. If we find a duplicate entry, we resolve it and + ** Save this item. Try to avoid duplicate entries as much as + ** possible. If we find a duplicate entry, we resolve it and ** pass along it's ID such that we can update it if needed. */ diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index abe593497664..21ea91e06307 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -210,7 +210,7 @@ function aggregator_settings() { $form['aggregator_clear'] = array( '#type' => 'select', '#title' => t('Discard news items older than'), '#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period, - '#description' => t('Older news items will be automatically discarded. Requires crontab.') + '#description' => t('Older news items will be automatically discarded. Requires crontab.') ); $form['aggregator_category_selector'] = array( @@ -823,7 +823,7 @@ function aggregator_parse_feed(&$data, $feed) { /* ** We reverse the array such that we store the first item last, - ** and the last item first. In the database, the newest item + ** and the last item first. In the database, the newest item ** should be at the top. */ @@ -838,7 +838,7 @@ function aggregator_parse_feed(&$data, $feed) { } /* - ** Resolve the item's title. If no title is found, we use + ** Resolve the item's title. If no title is found, we use ** up to 40 characters of the description ending at a word ** boundary but not splitting potential entities. */ @@ -875,7 +875,7 @@ function aggregator_parse_feed(&$data, $feed) { } /* - ** Try to resolve and parse the item's publication date. If no + ** Try to resolve and parse the item's publication date. If no ** date is found, we use the current date instead. */ @@ -898,8 +898,8 @@ function aggregator_parse_feed(&$data, $feed) { } /* - ** Save this item. Try to avoid duplicate entries as much as - ** possible. If we find a duplicate entry, we resolve it and + ** Save this item. Try to avoid duplicate entries as much as + ** possible. If we find a duplicate entry, we resolve it and ** pass along it's ID such that we can update it if needed. */ diff --git a/modules/archive.module b/modules/archive.module index 46f49953db61..93a09b5c0136 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -12,8 +12,8 @@ function archive_help($section) { switch ($section) { case 'admin/help#archive': - $output = '

'. t('The archive page allows content to be viewed by date. It also provides a monthly calendar view that users can use to navigate through content.') .'

'; - $output .= '

'. t('To view the archive by date, select the date in the calendar. Administrators can enable the browse archives block in block administration to allow users to browse by calendar. Clicking on a date in the monthly calendar view shows the content for that date. Users can navigate to different months using arrows beside the month\'s name in the calendar display. The current date will be highlighted in the calendar.') .'

'; + $output = '

'. t('The archive page allows content to be viewed by date. It also provides a monthly calendar view that users can use to navigate through content.') .'

'; + $output .= '

'. t('To view the archive by date, select the date in the calendar. Administrators can enable the browse archives block in block administration to allow users to browse by calendar. Clicking on a date in the monthly calendar view shows the content for that date. Users can navigate to different months using arrows beside the month\'s name in the calendar display. The current date will be highlighted in the calendar.') .'

'; $output .= t('

You can

'); $output .= '

'. t('Module blocks') .'

'; - $output .= '

'. t('Module blocks are available when modules are enabled. These blocks can be administered in block administration.') .'

'; + $output .= '

'. t('Module blocks are available when modules are enabled. These blocks can be administered in block administration.') .'

'; $output .= '

'. t('Administrator defined blocks') .'

'; $output .= '

'. t('An administrator defined block contains content supplied by the administrator. Each admin-defined block consists of a title, a description, and a body which can be as long as you wish. The Drupal engine will render the content of the block.') .'

'; $output .= t('

You can

@@ -41,7 +41,7 @@ function block_help($section) { case 'admin/block': return t("

Blocks are content rendered into regions, often boxes in the left and right side bars of the web site. They are made available by modules or created manually.

-

Only enabled blocks are shown. You can position the blocks by deciding which area of the page they will show up on (e.g., a sidebar) and in which order they appear (weight). Highlighting on this page shows the regions where content will be rendered.

+

Only enabled blocks are shown. You can position the blocks by deciding which area of the page they will show up on (e.g., a sidebar) and in which order they appear (weight). Highlighting on this page shows the regions where content will be rendered.

If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You can configure the auto-throttle on the throttle configuration page after having enabled the throttle module.

", array('%throttle' => url('admin/settings/throttle'))); case 'admin/block/add': diff --git a/modules/blog.module b/modules/blog.module index 43f143078024..b59d7bc7d9e8 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -56,8 +56,8 @@ function blog_user($type, &$edit, &$user) { function blog_help($section) { switch ($section) { case 'admin/help#blog': - $output = '

'. t('The blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. Blogs are made up of individual posts that are time stamped and are typically viewed by date as you would a diary. Blogs often contain links to webpages users have read and/or agree/disagree with.') .'

'; - $output .= '

'. t('The blog module adds a user blogs navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. The navigation menu has a create a blog entry link (which takes you to a submission form) and a view personal blog link (which displays your blog entries as other people will see them). The blog module also creates a recent blog posts block that can be enabled.') .'

'; + $output = '

'. t('The blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. Blogs are made up of individual posts that are time stamped and are typically viewed by date as you would a diary. Blogs often contain links to webpages users have read and/or agree/disagree with.') .'

'; + $output .= '

'. t('The blog module adds a user blogs navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. The navigation menu has a create a blog entry link (which takes you to a submission form) and a view personal blog link (which displays your blog entries as other people will see them). The blog module also creates a recent blog posts block that can be enabled.') .'

'; $output .= '

'. t('If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link next to each news item in its lists. Clicking on this takes the user to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for the user to add a comment or explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the website and from your syndicated partner sites.') .'

'; $output .= t('

You can