diff options
Diffstat (limited to 'modules')
25 files changed, 82 insertions, 82 deletions
diff --git a/modules/book/book.install b/modules/book/book.install index 1036d962a..94de935bb 100644 --- a/modules/book/book.install +++ b/modules/book/book.install @@ -47,7 +47,7 @@ function _book_install_type_create() { * Drupal 5.x to 6.x update. * * This function moves any existing book hierarchy into the new structure used - * in the 6.x module. Rather than storing the hierarchy in the {book} table, + * in the 6.x module. Rather than storing the hierarchy in the {book} table, * the menu API is used to store the hierarchy in the {menu_links} table and the * {book} table serves to uniquely connect a node to a menu link. * diff --git a/modules/book/book.module b/modules/book/book.module index 835d214bc..64da2a5a9 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -575,7 +575,7 @@ function book_update_bid($book_link) { * @return * A linear array of menu links in the order that the links are shown in the * menu, so the previous and next pages are the elements before and after the - * element corresponding to $node. The children of $node (if any) will come + * element corresponding to $node. The children of $node (if any) will come * immediately after it in the array. */ function book_get_flat_menu($book_link) { @@ -963,7 +963,7 @@ function _book_toc_recurse($tree, $indent, &$toc, $exclude, $depth_limit) { * @param $bid * The ID of the book whose pages are to be listed. * @param $exclude - * Optional array of mlid values. Any link whose mlid is in this array + * Optional array of mlid values. Any link whose mlid is in this array * will be excluded (along with its children). * @param $depth_limit * Any link deeper than this value will be excluded (along with its children). diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc index aa356837f..a6139279a 100644 --- a/modules/book/book.pages.inc +++ b/modules/book/book.pages.inc @@ -221,7 +221,7 @@ function book_remove_form_submit($form, &$form_state) { /** * AJAX callback to replace the book parent select options. * - * This function is called when the selected book is changed. It updates the + * This function is called when the selected book is changed. It updates the * cached form (either the node form or the book outline form) and returns * rendered output to be used to replace the select containing the possible * parent pages in the newly selected book. diff --git a/modules/comment/comment.module b/modules/comment/comment.module index e3e4d5243..4f47d9657 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1508,7 +1508,7 @@ function comment_form(&$form_state, $edit, $title = NULL) { ); // Only show the save button if comment previews are optional or if we are - // already previewing the submission. However, if there are form errors, + // already previewing the submission. However, if there are form errors, // we hide the save button no matter what, so that optional form elements // (e.g., captchas) can be updated. if (!form_get_errors() && ((variable_get('comment_preview_' . $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) { diff --git a/modules/filter/filter.api.php b/modules/filter/filter.api.php index a02c5a2fb..b92d00f79 100644 --- a/modules/filter/filter.api.php +++ b/modules/filter/filter.api.php @@ -92,7 +92,7 @@ * @param $text * The content to filter (applies to 'prepare' and 'process'). * @param $langcode - * The language code associated with the content, e.g. 'en' for English. This + * The language code associated with the content, e.g. 'en' for English. This * enables filters to be language aware and can be used to implement language * specific text replacements. * @param $cache_id diff --git a/modules/filter/filter.module b/modules/filter/filter.module index cb2e3b616..ae07a6248 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -412,7 +412,7 @@ function filter_list_format($format) { * the default format. * @param $langcode * Optional: the language code of the text to be filtered, e.g. 'en' for - * English. This allows filters to be language aware so language specific + * English. This allows filters to be language aware so language specific * text replacement can be implemented. * @param $check * Whether to check the $format with filter_access() first. Defaults to TRUE. diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc index 1e8904384..4a1512ff1 100644 --- a/modules/filter/filter.pages.inc +++ b/modules/filter/filter.pages.inc @@ -42,7 +42,7 @@ function filter_tips_long() { * @param $long * (optional) Whether the passed in filter tips contain extended explanations, * i.e. intended to be output on the path 'filter/tips' (TRUE), or are in a - * short format, i.e. suitable to be displayed below a form element. Defaults + * short format, i.e. suitable to be displayed below a form element. Defaults * to FALSE. * * @see _filter_tips() diff --git a/modules/forum/forum.install b/modules/forum/forum.install index a7a6e99f8..9daac0310 100644 --- a/modules/forum/forum.install +++ b/modules/forum/forum.install @@ -103,7 +103,7 @@ function forum_schema() { /** * Create the forum vocabulary if does not exist. Assign the * vocabulary a low weight so it will appear first in forum topic - * create and edit forms. Do not just call forum_enable() because in + * create and edit forms. Do not just call forum_enable() because in * future versions it might do something different. */ function forum_update_6000() { diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 13ccfda3d..b70e52815 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -165,7 +165,7 @@ function forum_init() { */ function _forum_nodeapi_check_node_type($node, $vocabulary) { // We are going to return if $node->type is not one of the node - // types assigned to the forum vocabulary. If forum_nav_vocabulary + // types assigned to the forum vocabulary. If forum_nav_vocabulary // is undefined or the vocabulary does not exist, it clearly cannot // be assigned to $node->type, so return to avoid E_ALL warnings. if (empty($vocabulary)) { diff --git a/modules/help/help.api.php b/modules/help/help.api.php index 387fb90ca..08e35f431 100644 --- a/modules/help/help.api.php +++ b/modules/help/help.api.php @@ -34,11 +34,11 @@ * An array that corresponds to the return of the arg() function - if a module * needs to provide help for a page with additional parameters after the * Drupal path or help for a specific value for a wildcard in the path, then - * the values in this array can be referenced. For example you could provide - * help for user/1 by looking for the path user/% and $arg[1] == '1'. This + * the values in this array can be referenced. For example you could provide + * help for user/1 by looking for the path user/% and $arg[1] == '1'. This * array should always be used rather than directly invoking arg(). Note that * depending on which module is invoking hook_help, $arg may contain only, - * empty strings. Regardless, $arg[0] to $arg[11] will always be set. + * empty strings. Regardless, $arg[0] to $arg[11] will always be set. * @return * A localized string containing the help text. Every web link, l(), or * url() must be replaced with %something and put into the final t() diff --git a/modules/locale/locale.install b/modules/locale/locale.install index 8b16c4929..de8f6fe98 100644 --- a/modules/locale/locale.install +++ b/modules/locale/locale.install @@ -117,7 +117,7 @@ function locale_update_6000() { /** * Change locale column to language. The language column is added by * update_fix_d6_requirements() in update.php to avoid a large number - * of error messages from update.php. All we need to do here is copy + * of error messages from update.php. All we need to do here is copy * locale to language and then drop locale. */ function locale_update_6001() { diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 932cde227..4936d14eb 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -5,7 +5,7 @@ class LocaleTestCase extends DrupalWebTestCase { function getInfo() { return array( 'name' => t('String translate and validate'), - 'description' => 'Adds a new locale and translates its name. Checks the validation of translation strings.', + 'description' => 'Adds a new locale and translates its name. Checks the validation of translation strings.', 'group' => 'Locale', ); } diff --git a/modules/menu/menu.api.php b/modules/menu/menu.api.php index 7c1543a6d..c69eaa79d 100644 --- a/modules/menu/menu.api.php +++ b/modules/menu/menu.api.php @@ -32,7 +32,7 @@ * visits the path. If omitted, the parent menu item's callback will be used * instead. * - "page arguments": An array of arguments to pass to the page callback - * function. Integer values pass the corresponding URL component (see arg()). + * function. Integer values pass the corresponding URL component (see arg()). * - "access callback": A function returning a boolean value that determines * whether the user has access rights to this menu item. Defaults to * user_access() unless a value is inherited from a parent menu item.. @@ -85,8 +85,8 @@ function hook_menu() { * Alter the data being saved to the {menu_router} table after hook_menu is invoked. * * This hook is invoked by menu_router_build(). The menu definitions are passed - * in by reference. Each element of the $callbacks array is one item returned - * by a module from hook_menu. Additional items may be added, or existing items + * in by reference. Each element of the $callbacks array is one item returned + * by a module from hook_menu. Additional items may be added, or existing items * altered. * * @param $callbacks @@ -125,7 +125,7 @@ function hook_menu_link_alter(&$item, $menu) { * * This hook may be used, for example, to add a page-specific query string. * For performance reasons, only links that have $item['options']['alter'] == TRUE - * will be passed into this hook. The $item['options']['alter'] flag should + * will be passed into this hook. The $item['options']['alter'] flag should * generally be set using hook_menu_link_alter(). * * @param $item diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index ab8dfa874..be1dd7654 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -54,7 +54,7 @@ function theme_node_admin_overview($name, $type) { function node_type_form(&$form_state, $type = NULL) { drupal_add_js(drupal_get_path('module', 'node') .'/content_types.js'); if (!isset($type->type)) { - // This is a new type. Node module managed types are custom and unlocked. + // This is a new type. Node module managed types are custom and unlocked. $type = node_type_set_defaults(array('custom' => 1, 'locked' => 0)); } diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index c61794894..88a538d00 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -561,7 +561,7 @@ function node_admin_nodes_submit($form, &$form_state) { cache_clear_all(); } else { - // We need to rebuild the form to go to a second step. For example, to + // We need to rebuild the form to go to a second step. For example, to // show the confirmation form for the deletion of nodes. $form_state['rebuild'] = TRUE; } diff --git a/modules/node/node.api.php b/modules/node/node.api.php index df95d26aa..2c8f43387 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -739,8 +739,8 @@ function hook_update($node) { * this module), use hook_nodeapi() instead. * * Changes made to the $node object within a hook_validate() function will - * have no effect. The preferred method to change a node's content is to use - * hook_submit() or hook_nodeapi($op='submit') instead. If it is really + * have no effect. The preferred method to change a node's content is to use + * hook_submit() or hook_nodeapi($op='submit') instead. If it is really * necessary to change the node at the validate stage, you can use function * form_set_value(). * diff --git a/modules/node/node.module b/modules/node/node.module index c657a1548..db7871d49 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -382,7 +382,7 @@ function node_teaser($body, $format = NULL, $size = NULL) { // Initialize it to maximum in order to find the minimum. $min_rpos = $max_rpos; - // Store the reverse of the teaser. We use strpos on the reversed needle and + // Store the reverse of the teaser. We use strpos on the reversed needle and // haystack for speed and convenience. $reversed = strrev($teaser); @@ -417,7 +417,7 @@ function node_teaser($body, $format = NULL, $size = NULL) { // If a break point was found in this group, slice and return the teaser. if ($min_rpos !== $max_rpos) { - // Don't slice with length 0. Length must be <0 to slice from RHS. + // Don't slice with length 0. Length must be <0 to slice from RHS. return ($min_rpos === 0) ? $teaser : substr($teaser, 0, 0 - $min_rpos); } } @@ -1003,7 +1003,7 @@ function node_save(&$node) { // When inserting a node, $node->log must be set because // {node_revision}.log does not (and cannot) have a default - // value. If the user does not have permission to create + // value. If the user does not have permission to create // revisions, however, the form will not contain an element for // log so $node->log will be unset at this point. if (!isset($node->log)) { @@ -1011,7 +1011,7 @@ function node_save(&$node) { } // For the same reasons, make sure we have $node->teaser and - // $node->body. We should consider making these fields nullable + // $node->body. We should consider making these fields nullable // in a future version since node types are not required to use them. if (!isset($node->teaser)) { $node->teaser = ''; @@ -3012,4 +3012,4 @@ function node_elements() { */ function theme_node_links($element) { return theme('links', $element['#value'], array('class' => 'links inline')); -}
\ No newline at end of file +} diff --git a/modules/search/search.module b/modules/search/search.module index 8c3f496ca..13193fdb4 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -434,7 +434,7 @@ function search_index($sid, $type, $text) { global $base_url; $node_regexp = '@href=[\'"]?(?:' . preg_quote($base_url, '@') . '/|' . preg_quote(base_path(), '@') . ')(?:\?q=)?/?((?![a-z]+:)[^\'">]+)[\'">]@i'; - // Multipliers for scores of words inside certain HTML tags. The weights are stored + // Multipliers for scores of words inside certain HTML tags. The weights are stored // in a variable so that modules can overwrite the default weights. // Note: 'a' must be included for link ranking to work. $tags = variable_get('search_tag_weights', array( @@ -585,7 +585,7 @@ function search_index($sid, $type, $text) { // Insert results into search index foreach ($results[0] as $word => $score) { // If a word already exists in the database, its score gets increased - // appropriately. If not, we create a new record with the appropriate + // appropriately. If not, we create a new record with the appropriate // starting score. db_merge('search_index')->key(array( 'word' => $word, @@ -656,7 +656,7 @@ function search_nodeapi_update_index($node) { * Implementation of hook_nodeapi_update(). */ function search_nodeapi_update($node) { - // Reindex the node when it is updated. The node is automatically indexed + // Reindex the node when it is updated. The node is automatically indexed // when it is added, simply by being added to the node table. search_touch_node($node->nid); } @@ -880,7 +880,7 @@ function _search_parse_query(&$word, &$scores, $not = FALSE) { * indexed search (and thus, implements hook_update_index()). * * Results are retrieved in two logical passes. However, the two passes are - * joined together into a single query. And in the case of most simple + * joined together into a single query. And in the case of most simple * queries the second pass is not even used. * * The first pass selects a set of all possible matches, which has the benefit diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 60382b6bf..0185c632c 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -806,7 +806,7 @@ class DrupalWebTestCase { drupal_install_modules($modules); // Because the schema is static cached, we need to flush - // it between each run. If we don't, then it will contain + // it between each run. If we don't, then it will contain // stale data for the previous run's database prefix and all // calls to it will fail. drupal_get_schema(NULL, TRUE); @@ -1033,8 +1033,8 @@ class DrupalWebTestCase { protected function drupalGet($path, array $options = array(), array $headers = array()) { $options['absolute'] = TRUE; - // We re-using a CURL connection here. If that connection still has certain - // options set, it might change the GET into a POST. Make sure we clear out + // We re-using a CURL connection here. If that connection still has certain + // options set, it might change the GET into a POST. Make sure we clear out // previous options. $out = $this->curlExec(array(CURLOPT_HTTPGET => TRUE, CURLOPT_URL => url($path, $options), CURLOPT_NOBODY => FALSE, CURLOPT_HTTPHEADER => $headers)); $this->refreshVariables(); // Ensure that any changes to variables in the other thread are picked up. diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index 66087f49b..6d35acc90 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -5,8 +5,8 @@ * Dummy class for fetching into a class. * * PDO supports using a new instance of an arbitrary class for records - * rather than just a stdClass or array. This class is for testing that - * functionality. (See testQueryFetchClass() below) + * rather than just a stdClass or array. This class is for testing that + * functionality. (See testQueryFetchClass() below) */ class FakeRecord { } @@ -941,7 +941,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase { // This is a very contrived example, as I have no idea why you'd want to // change age this way, but that's beside the point. // Note that we are also double-setting age here, once as a literal and - // once as an expression. This test will only pass if the expression wins, + // once as an expression. This test will only pass if the expression wins, // which is what is supposed to happen. db_merge('test_people') ->key(array('job' => 'Speaker')) @@ -1446,7 +1446,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase { function testNestedConditions() { // This query should translate to: // "SELECT job FROM {test} WHERE name = 'Paul' AND (age = 26 OR age = 27)" - // That should find only one record. Yes it's a non-optimal way of writing + // That should find only one record. Yes it's a non-optimal way of writing // that query but that's not the point! $query = db_select('test'); $query->addField('test', 'job'); diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 5160fe19a..d2b280790 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1300,7 +1300,7 @@ function hook_requirements($phase) { * details on schema definition structures. * * @return - * A schema definition structure array. For each element of the + * A schema definition structure array. For each element of the * array, the key is a table name and the value is a table structure * definition. */ diff --git a/modules/system/system.install b/modules/system/system.install index 0e9d8e4d7..b224e2e06 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1330,7 +1330,7 @@ function system_update_6000() { function system_update_6001() { $ret = array(); - // Add vid to term-node relation. The schema says it is unsigned. + // Add vid to term-node relation. The schema says it is unsigned. db_add_field($ret, 'term_node', 'vid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)); db_drop_primary_key($ret, 'term_node'); db_add_primary_key($ret, 'term_node', array('vid', 'tid', 'nid')); @@ -1362,13 +1362,13 @@ function system_update_6003() { /** * This update used to add an index on users created column (#127941). - * However, system_update_1022() does the same thing. This update + * However, system_update_1022() does the same thing. This update * tried to detect if 1022 had already run but failed to do so, * resulting in an "index already exists" error. * - * Adding the index here is never necessary. Sites installed before - * 1022 will run 1022, getting the update. Sites installed on/after 1022 - * got the index when the table was first created. Therefore, this + * Adding the index here is never necessary. Sites installed before + * 1022 will run 1022, getting the update. Sites installed on/after 1022 + * got the index when the table was first created. Therefore, this * function is now a no-op. */ function system_update_6004() { @@ -1386,16 +1386,16 @@ function system_update_6005() { // As of system.install:1.85 (before the new language // subsystem), new installs got a unique key named - // url_alias_dst_key on url_alias.dst. Unfortunately, + // url_alias_dst_key on url_alias.dst. Unfortunately, // system_update_162 created a unique key inconsistently named // url_alias_dst_idx on url_alias.dst (keys should have the _key - // suffix, indexes the _idx suffix). Therefore, sites installed + // suffix, indexes the _idx suffix). Therefore, sites installed // before system_update_162 have a unique key with a different - // name than sites installed after system_update_162(). Now, we + // name than sites installed after system_update_162(). Now, we // want to drop the unique key on dst which may have either one // of two names and create a new unique key on (dst, language). // There is no way to know which key name exists so we have to - // drop both, causing an SQL error. Thus, we just hide the + // drop both, causing an SQL error. Thus, we just hide the // error and only report the update_sql results that work. $err = error_reporting(0); $ret1 = update_sql('DROP INDEX {url_alias}_dst_idx'); @@ -1456,9 +1456,9 @@ function system_update_6007() { } /** - * Add info files to themes. The info and owner columns are added by + * Add info files to themes. The info and owner columns are added by * update_fix_d6_requirements() in update.php to avoid a large number - * of error messages from update.php. All we need to do here is copy + * of error messages from update.php. All we need to do here is copy * description to owner and then drop description. */ function system_update_6008() { @@ -1527,7 +1527,7 @@ function system_update_6011() { } /** - * Add serialized field to cache tables. This is now handled directly + * Add serialized field to cache tables. This is now handled directly * by update.php, so this function is a no-op. */ function system_update_6012() { @@ -1690,11 +1690,11 @@ function system_update_6018() { * and pgsql schemas so they are the same and can be represented by a * single schema structure. * - * Note that the mysql and pgsql cases make different changes. This + * Note that the mysql and pgsql cases make different changes. This * is because each schema needs to be tweaked in different ways to - * conform to the new schema structure. Also, since they operate on + * conform to the new schema structure. Also, since they operate on * tables defined by many optional core modules which may not ever - * have been installed, they must test each table for existence. If + * have been installed, they must test each table for existence. If * the modules are first installed after this update exists the tables * will be created from the schema structure and will start out * correct. @@ -1728,10 +1728,10 @@ function system_update_6019() { db_change_field($ret, 'search_total', 'count', 'count', array('type' => 'float')); } - // Replace unique index dst_language with a unique constraint. The + // Replace unique index dst_language with a unique constraint. The // result is the same but the unique key fits our current schema - // structure. Also, the postgres documentation implies that - // unique constraints are preferable to unique indexes. See + // structure. Also, the postgres documentation implies that + // unique constraints are preferable to unique indexes. See // http://www.postgresql.org/docs/8.2/interactive/indexes-unique.html. if (db_table_exists('url_alias')) { db_drop_index($ret, 'url_alias', 'dst_language'); @@ -2015,7 +2015,7 @@ function system_update_6021() { $menu_primary_menu = variable_get('menu_primary_menu', 0); // Ensure that we wind up with a system menu named 'primary-links'. if (isset($_SESSION['menu_menu_map'][2])) { - // The primary links menu that ships with Drupal 5 has mid = 2. If this + // The primary links menu that ships with Drupal 5 has mid = 2. If this // menu hasn't been deleted by the site admin, we use that. $updated_primary_links_menu = 2; } @@ -2232,14 +2232,14 @@ function system_update_6028() { function system_update_6029() { // The watchdog table is now owned by dblog, which is not yet // "installed" according to the system table, but the table already - // exists. We set the module as "installed" here to avoid an error + // exists. We set the module as "installed" here to avoid an error // later. // // Although not the case for the initial D6 release, it is likely // that dblog.install will have its own update functions eventually. // However, dblog did not exist in D5 and this update is part of the // initial D6 release, so we know that dblog is not installed yet. - // It is therefore correct to install it as version 0. If + // It is therefore correct to install it as version 0. If // dblog updates exist, the next run of update.php will get them. drupal_set_installed_schema_version('dblog', 0); module_enable(array('dblog')); @@ -2313,7 +2313,7 @@ function system_update_6033() { if (db_table_exists('node_comment_statistics')) { // On pgsql but not mysql, db_change_field() drops all keys // involving the changed field, which in this case is the primary - // key. The normal approach is explicitly drop the pkey, change the + // key. The normal approach is explicitly drop the pkey, change the // field, and re-create the pkey. // // Unfortunately, in this case that won't work on mysql; we CANNOT @@ -2321,7 +2321,7 @@ function system_update_6033() { // included in at least one key or index. // // Since we cannot drop the pkey before db_change_field(), after - // db_change_field() we may or may not still have a pkey. The + // db_change_field() we may or may not still have a pkey. The // simple way out is to re-create the pkey only when using pgsql. // Realistic requirements trump idealistic purity. db_change_field($ret, 'node_comment_statistics', 'nid', 'nid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)); @@ -2519,7 +2519,7 @@ function system_update_6043() { db_add_index($ret, 'flood', 'allow', array('event', 'hostname', 'timestamp')); db_add_index($ret, 'history', 'nid', array('nid')); // Change length of theme field in {blocks} to be consistent with module, and - // to avoid a MySQL error regarding a too-long index. Also add new indices. + // to avoid a MySQL error regarding a too-long index. Also add new indices. db_change_field($ret, 'blocks', 'theme', 'theme', array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''),array( 'unique keys' => array('tmd' => array('theme', 'module', 'delta'),), 'indexes' => array('list' => array('theme', 'status', 'region', 'weight', 'module'),),)); diff --git a/modules/trigger/trigger.api.php b/modules/trigger/trigger.api.php index e33ce2205..e495513a3 100644 --- a/modules/trigger/trigger.api.php +++ b/modules/trigger/trigger.api.php @@ -28,12 +28,12 @@ * following key-value pairs: * - 'type': (required) the type is determined by what object the action * acts on. Possible choices are node, user, comment, and system. Or - * whatever your own custom type is. So, for the nodequeue module, the + * whatever your own custom type is. So, for the nodequeue module, the * type might be set to 'nodequeue' if the action would be performed on a * nodequeue. * - 'description': (required) The human-readable name of the action. * - 'configurable': (required) If FALSE, then the action doesn't require - * any extra configuration. If TRUE, then you should define a form + * any extra configuration. If TRUE, then you should define a form * function with the same name as the key, but with '_form' appended to * it (i.e., the form for 'node_assign_owner_action' is * 'node_assign_owner_action_form'.) @@ -41,22 +41,22 @@ * paired with the usual _submit function, and possibly a _validate * function. * - 'hooks': (required) An array of all of the operations this action is - * appropriate for, keyed by hook name. The trigger module uses this to + * appropriate for, keyed by hook name. The trigger module uses this to * filter out inappropriate actions when presenting the interface for - * assigning actions to events. If you are writing actions in your own + * assigning actions to events. If you are writing actions in your own * modules and you simply want to declare support for all possible hooks, - * you can set 'hooks' => array('any' => TRUE). Common hooks are 'user', + * you can set 'hooks' => array('any' => TRUE). Common hooks are 'user', * 'nodeapi', 'comment', or 'taxonomy'. Any hook that has been described * to Drupal in hook_hook_info() will work is a possiblity. * - 'behavior': (optional) Human-readable array of behavior descriptions. - * The only one we have now is 'changes node property'. You will almost + * The only one we have now is 'changes node property'. You will almost * certainly never have to return this in your own implementations of this * hook. * * The function that is called when the action is triggered is passed two * parameters - an object of the same type as the 'type' value of the * hook_action_info array, and a context variable that contains the context - * under which the action is currently running, sent as an array. For example, + * under which the action is currently running, sent as an array. For example, * the actions module sets the 'hook' and 'op' keys of the context array (so, * 'hook' may be 'nodeapi' and 'op' may be 'insert'). */ @@ -113,8 +113,8 @@ function hook_action_info_alter(&$actions) { * See also hook_action_info(). * * @return - * - A nested array. The outermost key defines the module that the triggers - * are from. The menu system will use the key to look at the .info file of + * - A nested array. The outermost key defines the module that the triggers + * are from. The menu system will use the key to look at the .info file of * the module and make a local task (a tab) in the trigger UI. * - The next key defines the hook being described. * - Inside of that array are a list of arrays keyed by hook operation. @@ -122,8 +122,8 @@ function hook_action_info_alter(&$actions) { * an English description of the hook. * * For example, the node_hook_info implementation has 'node' as the outermost - * key, as that's the module it's in. Next it has 'nodeapi' as the next key, - * as hook_nodeapi() is what applies to changes in nodes. Finally the keys + * key, as that's the module it's in. Next it has 'nodeapi' as the next key, + * as hook_nodeapi() is what applies to changes in nodes. Finally the keys * after that are the various operations for hook_nodeapi() that the node module * is exposing as triggers. */ diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index ec24f992f..34b74849e 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -444,7 +444,7 @@ function update_calculate_project_data($available) { // If we're running a dev snapshot and have a timestamp, stop // searching for security updates once we hit an official release - // older than what we've got. Allow 100 seconds of leeway to handle + // older than what we've got. Allow 100 seconds of leeway to handle // differences between the datestamp in the .info file and the // timestamp of the tarball itself (which are usually off by 1 or 2 // seconds) so that we don't flag that as a new release. @@ -579,7 +579,7 @@ function update_calculate_project_data($available) { function update_project_cache($cid) { $projects = array(); - // In some cases, we must clear the cache. Rather than do so on a time + // In some cases, we must clear the cache. Rather than do so on a time // basis, we check for specific paths. $q = $_GET['q']; $paths = array('admin/build/modules', 'admin/build/themes', 'admin/reports', 'admin/reports/updates', 'admin/reports/status', 'admin/reports/updates/check'); diff --git a/modules/user/user.module b/modules/user/user.module index 99badf6d7..97835baff 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -203,7 +203,7 @@ function user_load($array = array()) { * * @param $edit * An array of fields and values to save. For example array('name' - * => 'My name'). Keys that do not belong to columns in the user-related + * => 'My name'). Keys that do not belong to columns in the user-related * tables are added to the a serialized array in the 'data' column * and will be loaded in the $user->data array by user_load(). * Setting a field to NULL deletes it from the data column. @@ -840,7 +840,7 @@ function user_block_view($delta = '') { // Count users active within the defined period. $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900); - // Perform database queries to gather online user lists. We use s.timestamp + // Perform database queries to gather online user lists. We use s.timestamp // rather than u.access because it is much faster. $anonymous_count = drupal_session_count($interval); $authenticated_count = db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.uid > 0", array(':timestamp' => $interval))->fetchField(); @@ -2072,7 +2072,7 @@ function theme_user_signature($signature) { * Return an array of token to value mappings for user e-mail messages. * * @param $account - * The user object of the account being notified. Must contain at + * The user object of the account being notified. Must contain at * least the fields 'uid', 'name', and 'mail'. * @param $language * Language object to generate the tokens with. @@ -2129,7 +2129,7 @@ function user_preferred_language($account, $default = NULL) { * @see drupal_mail() * * @param $op - * The operation being performed on the account. Possible values: + * The operation being performed on the account. Possible values: * 'register_admin_created': Welcome message for user created by the admin * 'register_no_approval_required': Welcome message when user self-registers * 'register_pending_approval': Welcome message, user pending admin approval @@ -2139,7 +2139,7 @@ function user_preferred_language($account, $default = NULL) { * 'status_deleted': Account deleted * * @param $account - * The user object of the account being notified. Must contain at + * The user object of the account being notified. Must contain at * least the fields 'uid', 'name', and 'mail'. * @param $language * Optional language to use for the notification, overriding account language. |