Index: UPGRADE.txt =================================================================== RCS file: /cvs/drupal/drupal/UPGRADE.txt,v retrieving revision 1.12.2.1 diff -u -p -r1.12.2.1 UPGRADE.txt --- UPGRADE.txt 11 May 2010 09:39:36 -0000 1.12.2.1 +++ UPGRADE.txt 13 Sep 2010 13:05:48 -0000 @@ -14,9 +14,9 @@ Prior to upgrading, you should ensure th Let's begin! -1. Back up your Drupal database and site root directory. Be especially sure - to back up your "sites" directory which contains your configuration file, - added modules and themes, and your site's uploaded files. If other files +1. Back up your Drupal database and site root directory. Be especially sure + to back up your "sites" directory which contains your configuration file, + added modules and themes, and your site's uploaded files. If other files have modifications, such as .htaccess or robots.txt, back those up as well. Note: for a single site setup, the configuration file is the "settings.php" Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.113.2.12 diff -u -p -r1.113.2.12 install.php --- install.php 9 May 2010 14:13:31 -0000 1.113.2.12 +++ install.php 13 Sep 2010 13:05:49 -0000 @@ -41,7 +41,7 @@ function install_main() { drupal_load('module', 'filter'); // Install profile chosen, set the global immediately. - // This needs to be done before the theme cache gets + // This needs to be done before the theme cache gets // initialized in drupal_maintenance_theme(). if (!empty($_GET['profile'])) { $profile = preg_replace('/[^a-zA-Z_0-9]/', '', $_GET['profile']); @@ -478,7 +478,7 @@ function install_select_profile_form(&$f $names[$profile->name] = $name; } - // Display radio buttons alphabetically by human-readable name. + // Display radio buttons alphabetically by human-readable name. natcasesort($names); foreach ($names as $profile => $name) { $form['profile'][$name] = array( @@ -944,7 +944,7 @@ More details about installing Drupal are drupal_set_message($message, 'warning'); } } - } + } } /** Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.265.2.34 diff -u -p -r1.265.2.34 form.inc --- includes/form.inc 6 Aug 2010 11:02:49 -0000 1.265.2.34 +++ includes/form.inc 13 Sep 2010 13:05:50 -0000 @@ -301,7 +301,7 @@ function drupal_execute($form_id, &$form // Make sure $form_state is passed around by reference. $args[1] = &$form_state; - + $form = call_user_func_array('drupal_retrieve_form', $args); $form['#post'] = $form_state['values']; drupal_prepare_form($form_id, $form, $form_state); @@ -767,8 +767,8 @@ function form_execute_handlers($type, &$ foreach ($handlers as $function) { if (function_exists($function)) { - // Check to see if a previous _submit handler has set a batch, but - // make sure we do not react to a batch that is already being processed + // Check to see if a previous _submit handler has set a batch, but + // make sure we do not react to a batch that is already being processed // (for instance if a batch operation performs a drupal_execute()). if ($type == 'submit' && ($batch =& batch_get()) && !isset($batch['current_set'])) { // Some previous _submit handler has set a batch. We store the call Index: includes/image.gd.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/Attic/image.gd.inc,v retrieving revision 1.4 diff -u -p -r1.4 image.gd.inc --- includes/image.gd.inc 15 Jan 2008 10:17:42 -0000 1.4 +++ includes/image.gd.inc 13 Sep 2010 13:05:50 -0000 @@ -38,7 +38,7 @@ function image_gd_settings() { '#field_suffix' => t('%'), ); $form['#element_validate'] = array('image_gd_settings_validate'); - + return $form; } else { Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.56.2.4 diff -u -p -r1.56.2.4 install.inc --- includes/install.inc 16 Feb 2009 10:25:02 -0000 1.56.2.4 +++ includes/install.inc 13 Sep 2010 13:05:51 -0000 @@ -35,7 +35,7 @@ function drupal_load_updates() { * @param $module * A module name. * @return - * If the module has updates, an array of available updates sorted by version. + * If the module has updates, an array of available updates sorted by version. * Otherwise, FALSE. */ function drupal_get_schema_versions($module) { Index: includes/language.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/language.inc,v retrieving revision 1.14.2.2 diff -u -p -r1.14.2.2 language.inc --- includes/language.inc 22 Mar 2010 12:18:04 -0000 1.14.2.2 +++ includes/language.inc 13 Sep 2010 13:05:51 -0000 @@ -17,7 +17,7 @@ function language_initialize() { // Get a list of enabled languages. $languages = language_list('enabled'); $languages = $languages[1]; - + switch ($mode) { case LANGUAGE_NEGOTIATION_NONE: return language_default(); Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.255.2.35 diff -u -p -r1.255.2.35 menu.inc --- includes/menu.inc 6 Sep 2010 11:01:29 -0000 1.255.2.35 +++ includes/menu.inc 13 Sep 2010 13:05:51 -0000 @@ -579,7 +579,7 @@ function _menu_translate(&$router_item, $router_item['href'] = implode('/', $link_map); $router_item['options'] = array(); _menu_check_access($router_item, $map); - + // For performance, don't localize an item the user can't access. if ($router_item['access']) { _menu_item_localize($router_item, $map); @@ -1692,7 +1692,7 @@ function menu_cache_clear_all() { function menu_rebuild() { if (!lock_acquire('menu_rebuild')) { // Wait for another request that is already doing this work. - // We choose to block here since otherwise the router item may not + // We choose to block here since otherwise the router item may not // be avaiable in menu_execute_active_handler() resulting in a 404. lock_wait('menu_rebuild'); return FALSE; @@ -1703,7 +1703,7 @@ function menu_rebuild() { // Clear the menu, page and block caches. menu_cache_clear_all(); _menu_clear_page_cache(); - + if (defined('MAINTENANCE_MODE')) { variable_set('menu_rebuild_needed', TRUE); } @@ -1894,7 +1894,7 @@ function _menu_delete_item($item, $force * - plid The mlid of the parent. * - router_path The path of the relevant router item. * @return - * The mlid of the saved menu link, or FALSE if the menu link could not be + * The mlid of the saved menu link, or FALSE if the menu link could not be * saved. */ function menu_link_save(&$item) { Index: includes/module.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/module.inc,v retrieving revision 1.115.2.3 diff -u -p -r1.115.2.3 module.inc --- includes/module.inc 16 Nov 2009 17:17:35 -0000 1.115.2.3 +++ includes/module.inc 13 Sep 2010 13:05:51 -0000 @@ -243,15 +243,15 @@ function module_load_install($module) { /** * Load a module include file. - * + * * Examples: * @code * // Load node.admin.inc from the node module. * module_load_include('inc', 'node', 'node.admin'); * // Load content_types.inc from the node module. - * module_load_include('inc', 'node', 'content_types'); + * module_load_include('inc', 'node', 'content_types'); * @endcode - * + * * Do not use this function to load an install file. Use module_load_install() * instead. * @@ -260,7 +260,7 @@ function module_load_install($module) { * @param $module * The module to which the include file belongs. * @param $name - * Optionally, specify the base file name (without the $type extension). + * Optionally, specify the base file name (without the $type extension). * If not set, $module is used. */ function module_load_include($type, $module, $name = NULL) { Index: misc/jquery.js =================================================================== RCS file: /cvs/drupal/drupal/misc/jquery.js,v retrieving revision 1.12.2.3 diff -u -p -r1.12.2.3 jquery.js --- misc/jquery.js 25 Jun 2008 09:38:39 -0000 1.12.2.3 +++ misc/jquery.js 13 Sep 2010 13:05:51 -0000 @@ -1,4 +1,4 @@ -// $Id: jquery.js,v 1.12.2.3 2008/06/25 09:38:39 goba Exp $ +// $Id: jquery.js,v 1.12.2.3 2008/06/25 09:38:39 goba Exp $ /* * jQuery 1.2.6 - New Wave Javascript Index: misc/tabledrag.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tabledrag.js,v retrieving revision 1.13.2.5 diff -u -p -r1.13.2.5 tabledrag.js --- misc/tabledrag.js 18 Jun 2009 12:24:24 -0000 1.13.2.5 +++ misc/tabledrag.js 13 Sep 2010 13:05:52 -0000 @@ -704,7 +704,7 @@ Drupal.tableDrag.prototype.updateField = var maxVal = values[values.length - 1]; // Populate the values in the siblings. $(targetClass, siblings).each(function() { - // If there are more items than possible values, assign the maximum value to the row. + // If there are more items than possible values, assign the maximum value to the row. if (values.length > 0) { this.value = values.shift(); } Index: misc/textarea.js =================================================================== RCS file: /cvs/drupal/drupal/misc/textarea.js,v retrieving revision 1.22 diff -u -p -r1.22 textarea.js --- misc/textarea.js 17 Jan 2008 19:31:56 -0000 1.22 +++ misc/textarea.js 13 Sep 2010 13:05:52 -0000 @@ -4,7 +4,7 @@ Drupal.behaviors.textarea = function(con $('textarea.resizable:not(.textarea-processed)', context).each(function() { // Avoid non-processed teasers. if ($(this).is(('textarea.teaser:not(.teaser-processed)'))) { - return false; + return false; } var textarea = $(this).addClass('textarea-processed'), staticOffset = null; Index: misc/farbtastic/farbtastic.js =================================================================== RCS file: /cvs/drupal/drupal/misc/farbtastic/farbtastic.js,v retrieving revision 1.4.2.1 diff -u -p -r1.4.2.1 farbtastic.js --- misc/farbtastic/farbtastic.js 25 Jun 2008 09:34:17 -0000 1.4.2.1 +++ misc/farbtastic/farbtastic.js 13 Sep 2010 13:05:52 -0000 @@ -104,14 +104,14 @@ jQuery._farbtastic = function (container var x, y; var el = event.target || event.srcElement; var reference = fb.wheel; - + // If the offset from the relative element is undefined calculate it. if ( typeof event.offsetX == 'undefined' && typeof event.offsetY == 'undefined' ) { var offset = $(event.target).offset(false); event.offsetX = event.pageX - offset.left; event.offsetY = event.pageY - offset.top; } - + // Use offset coordinates and find common offsetParent var pos = { x: event.offsetX, y: event.offsetY }; Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.297.2.4 diff -u -p -r1.297.2.4 blog.module --- modules/blog/blog.module 25 Feb 2009 12:21:53 -0000 1.297.2.4 +++ modules/blog/blog.module 13 Sep 2010 13:05:52 -0000 @@ -32,7 +32,7 @@ function blog_perm() { function blog_access($op, $node, $account) { switch ($op) { case 'create': - // Anonymous users cannot post even if they have the permission. + // Anonymous users cannot post even if they have the permission. return user_access('create blog entries', $account) && $account->uid ? TRUE : NULL; case 'update': return user_access('edit any blog entry', $account) || (user_access('edit own blog entries', $account) && ($node->uid == $account->uid)) ? TRUE : NULL; @@ -105,7 +105,7 @@ function blog_form(&$node) { */ function blog_view($node, $teaser = FALSE, $page = FALSE) { if ($page) { - // Breadcrumb navigation. l() escapes the title, so we should not escape !name. + // Breadcrumb navigation. l() escapes the title, so we should not escape !name. drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("!name's blog", array('!name' => $node->name)), 'blog/'. $node->uid))); } return node_prepare($node, $teaser); Index: modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.6.2.3 diff -u -p -r1.6.2.3 blog.pages.inc --- modules/blog/blog.pages.inc 14 Sep 2009 15:08:00 -0000 1.6.2.3 +++ modules/blog/blog.pages.inc 13 Sep 2010 13:05:52 -0000 @@ -27,12 +27,12 @@ function blog_page_user($account) { $result = pager_query(db_rewrite_sql("SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $account->uid); $has_posts = FALSE; - + while ($node = db_fetch_object($result)) { $output .= node_view(node_load($node->nid), 1); $has_posts = TRUE; } - + if ($has_posts) { $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); } @@ -71,7 +71,7 @@ function blog_page_last() { $output .= node_view(node_load($node->nid), 1); $has_posts = TRUE; } - + if ($has_posts) { $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); } Index: modules/blogapi/blogapi.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/Attic/blogapi.module,v retrieving revision 1.115.2.5 diff -u -p -r1.115.2.5 blogapi.module --- modules/blogapi/blogapi.module 8 Oct 2008 20:12:17 -0000 1.115.2.5 +++ modules/blogapi/blogapi.module 13 Sep 2010 13:05:52 -0000 @@ -325,7 +325,7 @@ function blogapi_blogger_get_post($appke * TRUE if no error, or the blogapi_error(). */ function blogapi_status_error_check($node, $original_status) { - + $node = (object) $node; $node_type_default = variable_get('node_options_'. $node->type, array('status', 'promote')); Index: modules/menu/menu.install =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v retrieving revision 1.9.2.1 diff -u -p -r1.9.2.1 menu.install --- modules/menu/menu.install 6 Jan 2009 15:46:37 -0000 1.9.2.1 +++ modules/menu/menu.install 13 Sep 2010 13:05:52 -0000 @@ -7,7 +7,7 @@ function menu_install() { // Create tables. drupal_install_schema('menu'); - + $t = get_t(); db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'navigation', $t('Navigation'), $t('The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.')); db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'primary-links', $t('Primary links'), $t('Primary links are often used at the theme layer to show the major sections of a site. A typical representation for primary links would be tabs along the top.')); Index: modules/node/content_types.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v retrieving revision 1.50.2.3 diff -u -p -r1.50.2.3 content_types.inc --- modules/node/content_types.inc 14 Sep 2009 11:51:23 -0000 1.50.2.3 +++ modules/node/content_types.inc 13 Sep 2010 13:05:52 -0000 @@ -364,7 +364,7 @@ function node_node_type($op, $info) { function node_type_reset(&$type) { $info_array = module_invoke_all('node_info'); if (isset($info_array[$type->orig_type])) { - $info_array[$type->orig_type]['type'] = $type->orig_type; + $info_array[$type->orig_type]['type'] = $type->orig_type; $info = _node_type_set_defaults($info_array[$type->orig_type]); foreach ($info as $field => $value) { Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.19.2.3 diff -u -p -r1.19.2.3 node.admin.inc --- modules/node/node.admin.inc 8 Jun 2009 16:45:34 -0000 1.19.2.3 +++ modules/node/node.admin.inc 13 Sep 2010 13:05:52 -0000 @@ -503,7 +503,7 @@ function node_admin_nodes() { /** * Validate node_admin_nodes form submissions. - * + * * Check if any nodes have been selected to perform the chosen * 'Update option' on. */ @@ -516,7 +516,7 @@ function node_admin_nodes_validate($form /** * Process node_admin_nodes form submissions. - * + * * Execute the chosen 'Update option' on the selected nodes. */ function node_admin_nodes_submit($form, &$form_state) { Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.947.2.26 diff -u -p -r1.947.2.26 node.module --- modules/node/node.module 6 Aug 2010 11:41:13 -0000 1.947.2.26 +++ modules/node/node.module 13 Sep 2010 13:05:53 -0000 @@ -1263,10 +1263,10 @@ function node_search($op = 'search', $ke $join2 .= ' LEFT JOIN {node_counter} nc ON nc.nid = i.sid'; $total += $weight; } - - // When all search factors are disabled (ie they have a weight of zero), - // the default score is based only on keyword relevance and there is no need to - // adjust the score of each item. + + // When all search factors are disabled (ie they have a weight of zero), + // the default score is based only on keyword relevance and there is no need to + // adjust the score of each item. if ($total == 0) { $select2 = 'i.relevance AS score'; $total = 1; @@ -1274,7 +1274,7 @@ function node_search($op = 'search', $ke else { $select2 = implode(' + ', $ranking) . ' AS score'; } - + // Do search. $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join1, $conditions1 . (empty($where1) ? '' : ' AND '. $where1), $arguments1, $select2, $join2, $arguments2); @@ -1702,7 +1702,7 @@ function node_feed($nids = FALSE, $chann $item->body = $content; unset($item->teaser); } - + // Allow modules to modify the fully-built node. node_invoke_nodeapi($item, 'alter', $teaser, FALSE); } Index: modules/node/node.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v retrieving revision 1.28.2.4 diff -u -p -r1.28.2.4 node.pages.inc --- modules/node/node.pages.inc 27 Apr 2009 11:35:01 -0000 1.28.2.4 +++ modules/node/node.pages.inc 13 Sep 2010 13:05:53 -0000 @@ -32,7 +32,7 @@ function theme_node_add_list($content) { if ($content) { $output = '