Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.135 diff -u -p -r1.135 install.php --- install.php 11 Oct 2008 18:20:53 -0000 1.135 +++ install.php 12 Oct 2008 00:44:11 -0000 @@ -940,7 +940,7 @@ function install_check_requirements($pro } elseif ($writable) { $requirements['settings file'] = array( - 'title' => st('Settings file'), + 'title' => st('Settings file'), 'value' => st('Settings file is writable.'), ); } Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.262 diff -u -p -r1.262 update.php --- update.php 10 Oct 2008 07:35:51 -0000 1.262 +++ update.php 12 Oct 2008 00:44:12 -0000 @@ -329,7 +329,7 @@ function update_finished($success, $resu $_SESSION['update_results'] = $results; $_SESSION['update_success'] = $success; $_SESSION['updates_remaining'] = $operations; - + // Now that the update is done, we can disable site maintenance if it was // previously turned off. if (isset($_SESSION['site_offline']) && $_SESSION['site_offline'] == FALSE) { Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.805 diff -u -p -r1.805 common.inc --- includes/common.inc 11 Oct 2008 21:53:36 -0000 1.805 +++ includes/common.inc 12 Oct 2008 00:44:19 -0000 @@ -2704,7 +2704,7 @@ function drupal_system_listing($mask, $d /** * Hands off structured Drupal arrays to type-specific *_alter implementations. - * + * * This dispatch function hands off structured Drupal arrays to type-specific * *_alter implementations. It ensures a consistent interface for all altering * operations. Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.293 diff -u -p -r1.293 form.inc --- includes/form.inc 11 Oct 2008 21:10:59 -0000 1.293 +++ includes/form.inc 12 Oct 2008 00:44:23 -0000 @@ -1761,7 +1761,7 @@ function form_process_radios($element) { /** * Add input format selector to text elements with the #input_format property. * - * The #input_format property should be the ID of an input format, found in + * The #input_format property should be the ID of an input format, found in * {filter_formats}.format, which gets passed to filter_form(). * * If the property #input_format is set, the form element will be expanded into @@ -1777,7 +1777,7 @@ function form_process_radios($element) { * '#type' => 'textarea', * '#title' => t('Body'), * '#input_format' => isset($node->format) ? $node->format : FILTER_FORMAT_DEFAULT, - * ); + * ); * @endcode * * Becomes: Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.73 diff -u -p -r1.73 install.inc --- includes/install.inc 11 Oct 2008 22:46:21 -0000 1.73 +++ includes/install.inc 12 Oct 2008 00:44:25 -0000 @@ -88,7 +88,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) { @@ -105,10 +105,10 @@ function drupal_get_schema_versions($mod if (count($updates) == 0) { return FALSE; } - + // Make sure updates are run in numeric order, not in definition order. sort($updates, SORT_NUMERIC); - + return $updates; } @@ -231,7 +231,7 @@ function drupal_detect_database_types() unset($databases['mysql']); $databases = array('mysql' => $mysql_database) + $databases; } - + return $databases; } @@ -465,7 +465,7 @@ function drupal_verify_profile($profile, $missing_modules = array_diff($module_list, $present_modules); $requirements = array(); - + if (count($missing_modules)) { $modules = array(); foreach ($missing_modules as $module) { @@ -543,7 +543,7 @@ function _drupal_install_module($module) */ function drupal_install_init_database() { static $included = FALSE; - + if (!$included) { $connection_info = Database::getConnectionInfo(); $driver = $connection_info['default']['driver']; @@ -567,7 +567,7 @@ function drupal_install_system() { require_once DRUPAL_ROOT . '/' . $system_path . '/system.install'; drupal_install_init_database(); module_invoke('system', 'install'); - + $system_versions = drupal_get_schema_versions('system'); $system_version = $system_versions ? max($system_versions) : SCHEMA_INSTALLED; db_query("INSERT INTO {system} (filename, name, type, owner, status, bootstrap, schema_version) VALUES('%s', '%s', '%s', '%s', %d, %d, %d)", $system_path . '/system.module', 'system', 'module', '', 1, 0, $system_version); @@ -827,7 +827,7 @@ function drupal_install_fix_file($file, /** - * Send the user to a different installer page. + * Send the user to a different installer page. * * This issues an on-site HTTP redirect. Messages (and errors) are erased. * @@ -926,7 +926,7 @@ function drupal_check_profile($profile) * Extract highest severity from requirements array. * * @param $requirements - * An array of requirements, in the same format as is returned by + * An array of requirements, in the same format as is returned by * hook_requirements(). * @return * The highest severity in the array. Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.188 diff -u -p -r1.188 locale.inc --- includes/locale.inc 9 Oct 2008 00:02:28 -0000 1.188 +++ includes/locale.inc 12 Oct 2008 00:44:26 -0000 @@ -97,7 +97,7 @@ function theme_locale_languages_overview $header = array(array('data' => t('English name')), array('data' => t('Native name')), array('data' => t('Code')), array('data' => t('Direction')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations'))); $output = theme('table', $header, $rows, array('id' => 'language-order')); $output .= drupal_render($form); - + drupal_add_tabledrag('language-order', 'order', 'sibling', 'language-order-weight'); return $output; Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.293 diff -u -p -r1.293 menu.inc --- includes/menu.inc 8 Oct 2008 01:42:16 -0000 1.293 +++ includes/menu.inc 12 Oct 2008 00:44:29 -0000 @@ -1890,7 +1890,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) { @@ -1962,7 +1962,7 @@ function menu_link_save(&$item) { if (!$existing_item) { db_query("INSERT INTO {menu_links} ( - menu_name, plid, link_path, + menu_name, plid, link_path, hidden, external, has_children, expanded, weight, module, link_title, options, Index: includes/session.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/session.inc,v retrieving revision 1.61 diff -u -p -r1.61 session.inc --- includes/session.inc 11 Oct 2008 16:37:38 -0000 1.61 +++ includes/session.inc 12 Oct 2008 00:44:30 -0000 @@ -222,7 +222,7 @@ function drupal_session_destroy_uid($uid * * @param int $lifetime * The value of session.gc_maxlifetime, passed by PHP. - * Sessions not updated for more than $lifetime seconds will be removed. + * Sessions not updated for more than $lifetime seconds will be removed. */ function _sess_gc($lifetime) { // Be sure to adjust 'php_value session.gc_maxlifetime' to a large enough Index: includes/database/database.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/database.inc,v retrieving revision 1.12 diff -u -p -r1.12 database.inc --- includes/database/database.inc 8 Oct 2008 11:21:37 -0000 1.12 +++ includes/database/database.inc 12 Oct 2008 00:44:34 -0000 @@ -552,7 +552,7 @@ abstract class DatabaseConnection extend * A database query result resource, or NULL if the query was not executed * correctly. */ - abstract public function queryRange($query, Array $args, $from, $count, Array $options); + abstract public function queryRange($query, Array $args, $from, $count, Array $options); /** * Runs a SELECT query and stores its results in a temporary table. @@ -577,7 +577,7 @@ abstract class DatabaseConnection extend * A database query result resource, or FALSE if the query was not executed * correctly. */ - abstract function queryTemporary($query, Array $args, $tablename); + abstract function queryTemporary($query, Array $args, $tablename); /** * Returns the type of database driver. Index: includes/database/query.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/query.inc,v retrieving revision 1.5 diff -u -p -r1.5 query.inc --- includes/database/query.inc 6 Oct 2008 14:39:40 -0000 1.5 +++ includes/database/query.inc 12 Oct 2008 00:44:37 -0000 @@ -563,7 +563,7 @@ class MergeQuery extends Query { * The called object. */ public function update(Array $fields, Array $values = array()) { - if ($values) { + if ($values) { $fields = array_combine($fields, $values); } $this->updateFields = $fields; Index: modules/blogapi/blogapi.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v retrieving revision 1.131 diff -u -p -r1.131 blogapi.module --- modules/blogapi/blogapi.module 11 Oct 2008 03:08:09 -0000 1.131 +++ modules/blogapi/blogapi.module 12 Oct 2008 00:44:39 -0000 @@ -328,7 +328,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/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.471 diff -u -p -r1.471 book.module --- modules/book/book.module 9 Oct 2008 15:15:50 -0000 1.471 +++ modules/book/book.module 12 Oct 2008 00:44:41 -0000 @@ -324,11 +324,11 @@ function book_form_alter(&$form, $form_s $form['book']['pick-book'] = array( '#type' => 'submit', '#value' => t('Change book (update list of parents)'), - // Submit the node form so the parent select options get updated. - // This is typically only used when JS is disabled. Since the parent options - // won't be changed via AJAX, a button is provided in the node form to submit - // the form and generate options in the parent select corresponding to the - // selected book. This is similar to what happens during a node preview. + // Submit the node form so the parent select options get updated. + // This is typically only used when JS is disabled. Since the parent options + // won't be changed via AJAX, a button is provided in the node form to submit + // the form and generate options in the parent select corresponding to the + // selected book. This is similar to what happens during a node preview. '#submit' => array('node_form_submit_build_node'), '#weight' => 20, ); Index: modules/comment/comment.test =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v retrieving revision 1.15 diff -u -p -r1.15 comment.test --- modules/comment/comment.test 24 Sep 2008 22:38:20 -0000 1.15 +++ modules/comment/comment.test 12 Oct 2008 00:44:41 -0000 @@ -308,7 +308,7 @@ class CommentInterfaceTest extends Comme $this->assertText('This discussion is closed', t('Posting to node with comments disabled')); $this->assertNoField('edit-comment', t('Comment body field found.')); - // Attempt to post to node with read-only comments. + // Attempt to post to node with read-only comments. $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_READ_ONLY)); $this->assertTrue($this->node, t('Article node created.')); $this->drupalGet('comment/reply/' . $this->node->nid); @@ -449,14 +449,14 @@ class CommentAnonymous extends CommentHe $this->drupalLogin($this->admin_user); $this->setAnonymousUserComment(FALSE, FALSE); - // Attempt to view comments while disallowed. + // Attempt to view comments while disallowed. // NOTE: if authenticated user has permission to post comments, then a // "Login or register to post comments" type link may be shown. $this->drupalLogout(); $this->drupalGet('node/' . $this->node->nid); $this->assertNoRaw('
', t('Comments were not displayed.')); $this->assertNoLink('Add new comment', t('Link to add comment was found.')); - + // Attempt to view node-comment form while disallowed. $this->drupalGet('comment/reply/' . $this->node->nid); $this->assertText('You are not authorized to view comments', t('Error attempting to post comment.')); Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.228 diff -u -p -r1.228 filter.module --- modules/filter/filter.module 9 Oct 2008 15:15:51 -0000 1.228 +++ modules/filter/filter.module 12 Oct 2008 00:44:41 -0000 @@ -204,7 +204,7 @@ function filter_filter_tips($delta, $for 'tr' => NULL, 'td' => NULL, 'th' => NULL, 'del' => array( t('Deleted'), '' . t('Deleted') . ''), 'ins' => array( t('Inserted'), '' . t('Inserted') . ''), - // Assumes and describes li. + // Assumes and describes li. 'ol' => array( t('Ordered list - use the <li> to begin each list item'), '
  1. ' . t('First item') . '
  2. ' . t('Second item') . '
'), 'ul' => array( t('Unordered list - use the <li> to begin each list item'), ''), 'li' => NULL, Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.468 diff -u -p -r1.468 forum.module --- modules/forum/forum.module 11 Oct 2008 21:11:00 -0000 1.468 +++ modules/forum/forum.module 12 Oct 2008 00:44:41 -0000 @@ -156,9 +156,9 @@ function forum_init() { } /** - * _forum_nodeapi_check_node_type - * - * @param mixed $node + * _forum_nodeapi_check_node_type + * + * @param mixed $node * @param mixed $vocabulary * @access protected * @return bool @@ -235,7 +235,7 @@ function forum_nodeapi_prepare(&$node, $ /** * Implementation of hook_nodeapi_validate(). - * + * * Check in particular that only a "leaf" term in the associated taxonomy. */ function forum_nodeapi_validate(&$node, $teaser, $page) { Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.26 diff -u -p -r1.26 node.admin.inc --- modules/node/node.admin.inc 15 Sep 2008 20:48:08 -0000 1.26 +++ modules/node/node.admin.inc 12 Oct 2008 00:44:41 -0000 @@ -472,8 +472,8 @@ function node_admin_nodes() { $header[] = array('data' => t('Operations')); $form['header'] = array( - '#type' => 'value', - '#value' => $header, + '#type' => 'value', + '#value' => $header, ); // Build the query and load the nodes we want to display. Index: modules/node/node.test =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.test,v retrieving revision 1.7 diff -u -p -r1.7 node.test --- modules/node/node.test 11 Oct 2008 18:29:20 -0000 1.7 +++ modules/node/node.test 12 Oct 2008 00:44:41 -0000 @@ -431,7 +431,7 @@ class NodeTitleXSSTestCase extends Drupa * Implementation of getInfo(). */ function getInfo() { - return array( + return array( 'name' => t('Node title XSS filtering'), 'description' => t('Create a node with dangerous tags in its title and test that they are escaped.'), 'group' => t('Node'), Index: modules/openid/openid.js =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.js,v retrieving revision 1.6 diff -u -p -r1.6 openid.js --- modules/openid/openid.js 30 Jan 2008 22:11:22 -0000 1.6 +++ modules/openid/openid.js 12 Oct 2008 00:44:41 -0000 @@ -14,8 +14,8 @@ Drupal.behaviors.openid = function (cont $("li.openid-link:not(.openid-processed)", context) .addClass('openid-processed') .click( function() { - $loginElements.hide(); - $openidElements.css("display", "block"); + $loginElements.hide(); + $openidElements.css("display", "block"); // Remove possible error message. $("#edit-name, #edit-pass").removeClass("error"); $("div.messages.error").hide(); @@ -26,8 +26,8 @@ Drupal.behaviors.openid = function (cont $("li.user-link:not(.openid-processed)", context) .addClass('openid-processed') .click(function() { - $openidElements.hide(); - $loginElements.css("display", "block"); + $openidElements.hide(); + $loginElements.css("display", "block"); // Clear OpenID Identifier field and remove possible error message. $("#edit-openid-identifier").val('').removeClass("error"); $("div.messages.error").css("display", "block"); Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.268 diff -u -p -r1.268 search.module --- modules/search/search.module 9 Oct 2008 15:15:52 -0000 1.268 +++ modules/search/search.module 12 Oct 2008 00:44:43 -0000 @@ -579,8 +579,8 @@ 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 + // If a word already exists in the database, its score gets increased + // appropriately. If not, we create a new record with the appropriate // starting score. db_merge('search_index')->key(array( 'word' => $word, Index: modules/simpletest/drupal_web_test_case.php =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v retrieving revision 1.47 diff -u -p -r1.47 drupal_web_test_case.php --- modules/simpletest/drupal_web_test_case.php 9 Oct 2008 02:49:36 -0000 1.47 +++ modules/simpletest/drupal_web_test_case.php 12 Oct 2008 00:44:46 -0000 @@ -467,7 +467,7 @@ class DrupalWebTestCase { // Make sure type is valid. if (in_array($type, array('binary', 'html', 'image', 'javascript', 'php', 'sql', 'text'))) { - // Use original file directory instead of one created during setUp(). + // Use original file directory instead of one created during setUp(). $path = $this->original_file_directory . '/simpletest'; $files = file_scan_directory($path, '/' . $type . '\-.*/'); Index: modules/simpletest/tests/database_test.install =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.install,v retrieving revision 1.3 diff -u -p -r1.3 database_test.install --- modules/simpletest/tests/database_test.install 8 Oct 2008 18:34:30 -0000 1.3 +++ modules/simpletest/tests/database_test.install 12 Oct 2008 00:44:46 -0000 @@ -30,7 +30,8 @@ function database_test_schema() { 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, - 'default' => 0), + 'default' => 0, + ), 'job' => array( 'description' => "The person's job", 'type' => 'varchar', @@ -59,7 +60,7 @@ function database_test_schema() { 'length' => 255, 'not null' => TRUE, 'default' => '', - ), + ), 'age' => array( 'description' => "The person's age", 'type' => 'int', @@ -104,7 +105,7 @@ function database_test_schema() { 'description' => 'Simple unique ID.', 'type' => 'serial', 'not null' => TRUE, - ), + ), 'blob1' => array( 'description' => 'A dummy BLOB field.', 'type' => 'blob', Index: modules/simpletest/tests/database_test.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v retrieving revision 1.9 diff -u -p -r1.9 database_test.test --- modules/simpletest/tests/database_test.test 28 Sep 2008 21:52:08 -0000 1.9 +++ modules/simpletest/tests/database_test.test 12 Oct 2008 00:44:48 -0000 @@ -351,7 +351,7 @@ class DatabaseInsertTestCase extends Dat * Test that we can insert multiple records in one query object. */ function testMultiInsert() { - try { + try { $num_records_before = (int) db_query("SELECT COUNT(*) FROM {test}")->fetchField(); $query = db_insert('test'); @@ -379,7 +379,7 @@ class DatabaseInsertTestCase extends Dat $this->assertIdentical($saved_age, '31', t('Can retrieve by name.')); $saved_age = db_query("SELECT age FROM {test} WHERE name = :name", array(':name' => 'Moe'))->fetchField(); $this->assertIdentical($saved_age, '32', t('Can retrieve by name.')); - } + } catch (Exception $e) { $this->assertTrue(FALSE, $e->getMessage()); } @@ -419,7 +419,7 @@ class DatabaseInsertTestCase extends Dat $this->assertIdentical($saved_age, '31', t('Can retrieve by name.')); $saved_age = db_query("SELECT age FROM {test} WHERE name = :name", array(':name' => 'Moe'))->fetchField(); $this->assertIdentical($saved_age, '32', t('Can retrieve by name.')); - } + } catch (Exception $e) { $this->assertTrue(FALSE, $e->getMessage()); } @@ -453,7 +453,7 @@ class DatabaseInsertTestCase extends Dat ->execute(); $this->assertIdentical($id, '5', t('Auto-increment ID returned successfully.')); - } + } catch (Exception $e) { $this->assertTrue(FALSE, $e->getMessage()); } Index: modules/simpletest/tests/xmlrpc.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/xmlrpc.test,v retrieving revision 1.4 diff -u -p -r1.4 xmlrpc.test --- modules/simpletest/tests/xmlrpc.test 17 Sep 2008 16:49:41 -0000 1.4 +++ modules/simpletest/tests/xmlrpc.test 12 Oct 2008 00:44:48 -0000 @@ -29,13 +29,15 @@ class XMLRPCValidator1IncTestCase extend mt_srand(); - $array_1 = array(array('curly' => mt_rand(-100,100)), - array('curly' => mt_rand(-100,100)), - array('larry' => mt_rand(-100,100)), - array('larry' => mt_rand(-100,100)), - array('moe' => mt_rand(-100,100)), - array('moe' => mt_rand(-100,100)), - array('larry' => mt_rand(-100,100))); + $array_1 = array( + array('curly' => mt_rand(-100,100)), + array('curly' => mt_rand(-100,100)), + array('larry' => mt_rand(-100,100)), + array('larry' => mt_rand(-100,100)), + array('moe' => mt_rand(-100,100)), + array('moe' => mt_rand(-100,100)), + array('larry' => mt_rand(-100,100)), + ); shuffle($array_1); $l_res_1 = xmlrpc_test_arrayOfStructsTest($array_1); $r_res_1 = xmlrpc($xml_url, 'validator1.arrayOfStructsTest', $array_1); Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.98 diff -u -p -r1.98 system.admin.inc --- modules/system/system.admin.inc 11 Oct 2008 22:46:22 -0000 1.98 +++ modules/system/system.admin.inc 12 Oct 2008 00:44:53 -0000 @@ -2097,10 +2097,10 @@ function theme_system_modules_fieldset($ // Add the description, along with any dependencies. $description .= drupal_render($module['description']); if ($module['#dependencies']) { - $description .= '
' . t('Depends on: ') . implode(', ', $module['#dependencies']) . '
'; + $description .= '
' . t('Depends on: ') . implode(', ', $module['#dependencies']) . '
'; } if ($module['#dependents']) { - $description .= '
' . t('Required by: ') . implode(', ', $module['#dependents']) . '
'; + $description .= '
' . t('Required by: ') . implode(', ', $module['#dependents']) . '
'; } $row[] = array('data' => $description, 'class' => 'description'); $rows[] = $row; Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.270 diff -u -p -r1.270 system.install --- modules/system/system.install 11 Oct 2008 18:29:20 -0000 1.270 +++ modules/system/system.install 12 Oct 2008 00:44:57 -0000 @@ -549,7 +549,7 @@ function system_schema() { $schema['blocked_ips'] = array( 'description' => t('Stores blocked IP addresses.'), 'fields' => array( - 'iid' => array( + 'iid' => array( 'description' => t('Primary Key: unique ID for IP addresses.'), 'type' => 'serial', 'unsigned' => TRUE, @@ -887,7 +887,7 @@ function system_schema() { $schema['menu_links'] = array( 'description' => t('Contains the individual links within a menu.'), 'fields' => array( - 'menu_name' => array( + 'menu_name' => array( 'description' => t("The menu name. All links with the same menu name (such as 'navigation') are part of the same menu."), 'type' => 'varchar', 'length' => 32, @@ -3066,7 +3066,7 @@ function system_update_7011() { 'permission' => 'bypass node access', )); } - $insert->execute(); + $insert->execute(); return $ret; } @@ -3074,4 +3074,3 @@ function system_update_7011() { * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ - Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.629 diff -u -p -r1.629 system.module --- modules/system/system.module 11 Oct 2008 21:11:01 -0000 1.629 +++ modules/system/system.module 12 Oct 2008 00:44:58 -0000 @@ -770,7 +770,7 @@ function system_block($op = 'list', $del $blocks['powered-by'] = array( 'info' => t('Powered by Drupal'), 'weight' => '10', - // Not worth caching. + // Not worth caching. 'cache' => BLOCK_NO_CACHE, ); return $blocks; @@ -1383,8 +1383,8 @@ function system_get_module_admin_tasks($ if (!isset($items)) { $result = db_query(" - SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, ml.* - FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 2"); + SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, ml.* + FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 2"); $items = array(); while ($item = db_fetch_array($result)) { _menu_link_translate($item); Index: modules/system/system.test =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.test,v retrieving revision 1.18 diff -u -p -r1.18 system.test --- modules/system/system.test 11 Oct 2008 22:46:22 -0000 1.18 +++ modules/system/system.test 12 Oct 2008 00:44:58 -0000 @@ -210,11 +210,11 @@ class IPAddressBlockingTestCase extends $this->assertText(t('Please enter a valid IP address.')); // Submit your own IP address. This fails, although it works when testing manually. - // TODO: on some systems this test fails due to a bug or inconsistency in cURL. - // $edit = array(); - // $edit['ip'] = ip_address(); - // $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save')); - // $this->assertText(t('You may not block your own IP address.')); + // TODO: on some systems this test fails due to a bug or inconsistency in cURL. + // $edit = array(); + // $edit['ip'] = ip_address(); + // $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save')); + // $this->assertText(t('You may not block your own IP address.')); } } @@ -519,8 +519,8 @@ class PageTitleFiltering extends DrupalW $this->assertTrue(strpos(drupal_get_title(), '') !== FALSE, t('Tags in title are not converted to entities when $output is PASS_THROUGH.')); // Generate node content. $edit = array( - 'title' => '!SimpleTest! ' . $title . $this->randomName(20), - 'body' => '!SimpleTest! test body' . $this->randomName(200), + 'title' => '!SimpleTest! ' . $title . $this->randomName(20), + 'body' => '!SimpleTest! test body' . $this->randomName(200), ); // Create the node with HTML in the title. $this->drupalPost('node/add/page', $edit, t('Save')); @@ -531,4 +531,3 @@ class PageTitleFiltering extends DrupalW $this->assertText(check_plain($edit['title']), 'Check to make sure tags in the node title are converted.'); } } - Index: modules/taxonomy/taxonomy.test =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v retrieving revision 1.8 diff -u -p -r1.8 taxonomy.test --- modules/taxonomy/taxonomy.test 24 Sep 2008 18:42:00 -0000 1.8 +++ modules/taxonomy/taxonomy.test 12 Oct 2008 00:44:59 -0000 @@ -5,13 +5,13 @@ class TaxonomyVocabularyLoadTestCase ext /** * Implementation of getInfo(). */ - function getInfo() { - return array( - 'name' => t('Loading taxonomy vocabularies'), - 'description' => t('Test loading vocabularies under various conditions.'), - 'group' => t('Taxonomy'), - ); - } + function getInfo() { + return array( + 'name' => t('Loading taxonomy vocabularies'), + 'description' => t('Test loading vocabularies under various conditions.'), + 'group' => t('Taxonomy'), + ); + } /** * Implementation of setUp() { @@ -546,8 +546,7 @@ class TermEditTestCase extends DrupalWeb function getInfo() { return array( 'name' => 'Term edit test', - 'description' => t('Ensure terms can be edited from administration page - and that term name and description are saved.'), + 'description' => t('Ensure terms can be edited from administration page and that term name and description are saved.'), 'group' => t('Taxonomy')); } Index: modules/translation/translation.module =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v retrieving revision 1.33 diff -u -p -r1.33 translation.module --- modules/translation/translation.module 9 Oct 2008 18:32:47 -0000 1.33 +++ modules/translation/translation.module 12 Oct 2008 00:44:59 -0000 @@ -251,7 +251,7 @@ function translation_nodeapi_delete(&$no translation_remove_from_set($node); } } - + /** * Remove a node from its translation set (if any) * and update the set accordingly. Index: modules/trigger/trigger.module =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v retrieving revision 1.20 diff -u -p -r1.20 trigger.module --- modules/trigger/trigger.module 6 Oct 2008 12:55:56 -0000 1.20 +++ modules/trigger/trigger.module 12 Oct 2008 00:45:00 -0000 @@ -202,7 +202,7 @@ function _trigger_normalize_node_context /** * Simple wrapper function to make user hooks work with new entry points. * - * @TODO: Take advantage of the new API and reorganise/remove this function. + * @TODO: Take advantage of the new API and reorganise/remove this function. */ function _trigger_nodeapi(&$node, $op, $a3, $a4) { // Keep objects for reuse so that changes actions make to objects can persist. @@ -241,7 +241,7 @@ function _trigger_nodeapi(&$node, $op, $ } } } - + /** * Implementation of hook_nodeapi_view(). */ @@ -384,51 +384,51 @@ function _trigger_normalize_user_context } /** - * trigger_user_login + * trigger_user_login */ function trigger_user_login(&$edit, &$account, $category) { - _trigger_user('login', $edit, $account, $category); + _trigger_user('login', $edit, $account, $category); } /** * Implementation of hook_user_logout(). */ function trigger_user_logout(&$edit, &$account, $category) { - _trigger_user('logout', $edit, $account, $category); + _trigger_user('logout', $edit, $account, $category); } /** * Implementation of hook_user_insert(). */ function trigger_user_insert(&$edit, &$account, $category) { - _trigger_user('insert', $edit, $account, $category); + _trigger_user('insert', $edit, $account, $category); } /** * Implementation of hook_user_update(). */ function trigger_user_update(&$edit, &$account, $category) { - _trigger_user('update', $edit, $account, $category); + _trigger_user('update', $edit, $account, $category); } /** * Implementation of hook_user_delete(). */ function trigger_user_delete(&$edit, &$account, $category) { - _trigger_user('delete', $edit, $account, $category); + _trigger_user('delete', $edit, $account, $category); } /** * Implementation of hook_user_view(). */ function trigger_user_view(&$edit, &$account, $category) { - _trigger_user('view', $edit, $account, $category); + _trigger_user('view', $edit, $account, $category); } /** * Simple wrapper function to make user hooks work with new entry points. * - * @TODO: Take advantage of the new API and reorganise/remove this function. + * @TODO: Take advantage of the new API and reorganise/remove this function. */ function _trigger_user($op, &$edit, &$account, $category = NULL) { // Keep objects for reuse so that changes actions make to objects can persist. Index: modules/user/user.install =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.install,v retrieving revision 1.13 diff -u -p -r1.13 user.install --- modules/user/user.install 20 Sep 2008 20:22:25 -0000 1.13 +++ modules/user/user.install 12 Oct 2008 00:45:00 -0000 @@ -258,13 +258,13 @@ function user_update_7000(&$sandbox) { $count = 1000; $result = db_query_range("SELECT uid, pass FROM {users} WHERE uid > 0 ORDER BY uid", $sandbox['user_from'], $count); while ($account = db_fetch_array($result)) { - $has_rows = TRUE; - $new_hash = user_hash_password($account['pass'], $hash_count_log2); - if ($new_hash) { - // Indicate an updated password. - $new_hash = 'U' . $new_hash; - db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account['uid']); - } + $has_rows = TRUE; + $new_hash = user_hash_password($account['pass'], $hash_count_log2); + if ($new_hash) { + // Indicate an updated password. + $new_hash = 'U' . $new_hash; + db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account['uid']); + } } $ret['#finished'] = $sandbox['user_from']/$sandbox['user_count']; $sandbox['user_from'] += $count; @@ -295,4 +295,3 @@ function user_update_7001() { * @} End of "defgroup user-updates-6.x-to-7.x" * The next series of updates should start at 8000. */ - Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.927 diff -u -p -r1.927 user.module --- modules/user/user.module 9 Oct 2008 15:15:55 -0000 1.927 +++ modules/user/user.module 12 Oct 2008 00:45:04 -0000 @@ -570,24 +570,24 @@ function user_is_blocked($name) { * Implementation of hook_perm(). */ function user_perm() { - return array( - 'administer permissions' => array( - 'title' => t('Administer permissions'), - 'description' => t('Manage the permissions assigned to user roles. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), - ), - 'administer users' => array( - 'title' => t('Administer users'), - 'description' => t('Manage or block users, and manage their role assignments.'), - ), - 'access user profiles' => array( - 'title' => t('Access user profiles'), - 'description' => t('View profiles of users on the site, which may contain personal information.'), - ), - 'change own username' => array( - 'title' => t('Change own username'), - 'description' => t('Select a different username.'), - ), - ); + return array( + 'administer permissions' => array( + 'title' => t('Administer permissions'), + 'description' => t('Manage the permissions assigned to user roles. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + ), + 'administer users' => array( + 'title' => t('Administer users'), + 'description' => t('Manage or block users, and manage their role assignments.'), + ), + 'access user profiles' => array( + 'title' => t('Access user profiles'), + 'description' => t('View profiles of users on the site, which may contain personal information.'), + ), + 'change own username' => array( + 'title' => t('Change own username'), + 'description' => t('Select a different username.'), + ), + ); } /** @@ -1345,10 +1345,10 @@ function user_authenticate($form_values require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); if (user_check_password($password, $account)) { if (user_needs_new_hash($account)) { - $new_hash = user_hash_password($password); - if ($new_hash) { - db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account->uid); - } + $new_hash = user_hash_password($password); + if ($new_hash) { + db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account->uid); + } } $account = user_load(array('uid' => $account->uid, 'status' => 1)); $user = $account; @@ -2004,10 +2004,11 @@ function user_build_filter_query() { $where = !empty($where) ? 'AND ' . implode(' AND ', $where) : ''; $join = !empty($join) ? ' ' . implode(' ', array_unique($join)) : ''; - return array('where' => $where, - 'join' => $join, - 'args' => $args, - ); + return array( + 'where' => $where, + 'join' => $join, + 'args' => $args, + ); } /** @@ -2379,8 +2380,8 @@ function user_register() { $form = array_merge($form, user_edit_form($form_state, NULL, NULL, TRUE)); if ($admin) { $form['account']['notify'] = array( - '#type' => 'checkbox', - '#title' => t('Notify user of new account') + '#type' => 'checkbox', + '#title' => t('Notify user of new account') ); // Redirect back to page which initiated the create request; // usually admin/user/user/create. @@ -2447,4 +2448,3 @@ function _user_forms(&$edit, $account, $ return empty($groups) ? FALSE : $groups; } - Index: modules/user/user.test =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.test,v retrieving revision 1.17 diff -u -p -r1.17 user.test --- modules/user/user.test 10 Oct 2008 07:49:49 -0000 1.17 +++ modules/user/user.test 12 Oct 2008 00:45:06 -0000 @@ -316,7 +316,7 @@ class UserPictureTestCase extends Drupal * * results: The image shouldn't be uploaded */ - function testWithoutGDinvalidDimension() { + function testWithoutGDinvalidDimension() { if ($this->_directory_test) if (!image_get_toolkit()) { @@ -341,7 +341,7 @@ class UserPictureTestCase extends Drupal // Check if file is not uploaded. $this->assertFalse(is_file($pic_path), t('File was not uploaded.')); } - } + } /** * Do the test: @@ -350,7 +350,7 @@ class UserPictureTestCase extends Drupal * * results: The image shouldn't be uploaded */ - function testWithoutGDinvalidSize() { + function testWithoutGDinvalidSize() { if ($this->_directory_test) if (!image_get_toolkit()) { $this->drupalLogin($this->user); Index: scripts/run-tests.sh =================================================================== RCS file: /cvs/drupal/drupal/scripts/run-tests.sh,v retrieving revision 1.12 diff -u -p -r1.12 run-tests.sh --- scripts/run-tests.sh 24 Sep 2008 19:00:31 -0000 1.12 +++ scripts/run-tests.sh 12 Oct 2008 00:45:07 -0000 @@ -111,19 +111,19 @@ All arguments are long options. --url Immediately preceeds a URL to set the host and path. You will need this parameter if Drupal is in a subdirectory on your localhost and you have not set \$base_url in settings.php. - + --php The absolute path to the PHP executable. Usually not needed. --concurrency [num] Run tests in parallel, up to [num] tests at a time. This requires - the Process Control Extension (PCNTL) to be compiled in PHP, not + the Process Control Extension (PCNTL) to be compiled in PHP, not supported under Windows. --all Run all available tests. --class Run tests identified by specific class names, instead of group names. - + --file Run tests identifiled by specific file names, instead of group names. Specify the path and the extension (i.e. 'modules/user/user.test'). @@ -391,7 +391,7 @@ function simpletest_script_get_test_list foreach ($args['test_names'] as $file) { $files[realpath($file)] = 1; } - + // Check for valid class names. foreach ($all_tests as $class_name => $instance) { $refclass = new ReflectionClass($class_name); Index: sites/default/default.settings.php =================================================================== RCS file: /cvs/drupal/drupal/sites/default/default.settings.php,v retrieving revision 1.15 diff -u -p -r1.15 default.settings.php --- sites/default/default.settings.php 6 Oct 2008 10:54:15 -0000 1.15 +++ sites/default/default.settings.php 12 Oct 2008 00:45:07 -0000 @@ -46,7 +46,7 @@ /** * Database settings: * - * The $databases array specifies the database connection or + * The $databases array specifies the database connection or * connections that Drupal may use. Drupal is able to connect * to multiple databases, including multiple types of databases, * during the same request. @@ -63,7 +63,7 @@ * 'port' => 3306, * ); * - * The "driver" property indicates what Drupal database driver the + * The "driver" property indicates what Drupal database driver the * connection should use. This is usually the same as the name of the * database type, such as mysql or sqlite, but not always. The other * properties will vary depending on the driver. For SQLite, you must @@ -80,7 +80,7 @@ * A target database allows Drupal to try to send certain queries to a * different database if it can but fall back to the default connection if not. * That is useful for master/slave replication, as Drupal may try to connect - * to a slave server when appropriate and if one is not available will simply + * to a slave server when appropriate and if one is not available will simply * fall back to the single master server. * * The general format for the $databases array is as follows: