? sites/default/modules ? sites/default/settings.php Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.134 diff -u -p -r1.134 install.php --- install.php 1 Oct 2008 00:27:29 -0000 1.134 +++ install.php 9 Oct 2008 05:51:17 -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.261 diff -u -p -r1.261 update.php --- update.php 8 Oct 2008 11:11:09 -0000 1.261 +++ update.php 9 Oct 2008 05:51:17 -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/cache.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/cache.inc,v retrieving revision 1.24 diff -u -p -r1.24 cache.inc --- includes/cache.inc 17 Sep 2008 07:11:55 -0000 1.24 +++ includes/cache.inc 9 Oct 2008 05:51:17 -0000 @@ -2,15 +2,15 @@ // $Id: cache.inc,v 1.24 2008/09/17 07:11:55 dries Exp $ /** - * Return data from the persistent cache. Data may be stored as either plain - * text or as serialized data. cache_get will automatically return + * Return data from the persistent cache. Data may be stored as either plain + * text or as serialized data. cache_get will automatically return * unserialized objects and arrays. * * @param $cid * The cache ID of the data to retrieve. * @param $table - * The table $table to store the data in. Valid core values are - * 'cache_filter', 'cache_menu', 'cache_page', or 'cache' for + * The table $table to store the data in. Valid core values are + * 'cache_filter', 'cache_menu', 'cache_page', or 'cache' for * the default cache. * @return The cache or FALSE on failure. */ @@ -84,11 +84,11 @@ function cache_get($cid, $table = 'cache * @param $cid * The cache ID of the data to store. * @param $data - * The data to store in the cache. Complex data types will be automatically + * The data to store in the cache. Complex data types will be automatically * serialized before insertion. * Strings will be stored as plain text and not serialized. * @param $table - * The table $table to store the data in. Valid core values are + * The table $table to store the data in. Valid core values are * 'cache_filter', 'cache_menu', 'cache_page', or 'cache'. * @param $expire * One of the following values: Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.802 diff -u -p -r1.802 common.inc --- includes/common.inc 9 Oct 2008 01:49:03 -0000 1.802 +++ includes/common.inc 9 Oct 2008 05:51:17 -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.289 diff -u -p -r1.289 form.inc --- includes/form.inc 27 Sep 2008 19:47:42 -0000 1.289 +++ includes/form.inc 9 Oct 2008 05:51:17 -0000 @@ -1755,7 +1755,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 @@ -1771,7 +1771,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.72 diff -u -p -r1.72 install.inc --- includes/install.inc 1 Oct 2008 00:27:29 -0000 1.72 +++ includes/install.inc 9 Oct 2008 05:51:17 -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) { @@ -540,7 +540,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']; @@ -564,7 +564,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); @@ -818,7 +818,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. * @@ -917,7 +917,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 9 Oct 2008 05:51:18 -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 9 Oct 2008 05:51:18 -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) { Index: includes/session.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/session.inc,v retrieving revision 1.60 diff -u -p -r1.60 session.inc --- includes/session.inc 27 Sep 2008 20:37:00 -0000 1.60 +++ includes/session.inc 9 Oct 2008 05:51:18 -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/mysql/schema.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/mysql/schema.inc,v retrieving revision 1.4 diff -u -p -r1.4 schema.inc --- includes/database/mysql/schema.inc 8 Oct 2008 11:09:16 -0000 1.4 +++ includes/database/mysql/schema.inc 9 Oct 2008 05:51:18 -0000 @@ -299,7 +299,7 @@ class DatabaseSchema_mysql extends Datab } public function changeField(&$ret, $table, $field, $field_new, $spec, $keys_new = array()) { - $sql = 'ALTER TABLE {' . $table . '} CHANGE `' . $field . '` ' . $this->createFieldSql($field_new, $this->processField($spec)); + $sql = 'ALTER TABLE {' . $table . '} CHANGE `' . $field . '` ' . $this->createFieldSql($field_new, $this->processField($spec)); if (count($keys_new)) { $sql .= ', ADD ' . implode(', ADD ', $this->createKeysSql($keys_new)); } 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 9 Oct 2008 05:51:18 -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/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.466 diff -u -p -r1.466 forum.module --- modules/forum/forum.module 8 Oct 2008 03:27:56 -0000 1.466 +++ modules/forum/forum.module 9 Oct 2008 05:51:18 -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/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.267 diff -u -p -r1.267 search.module --- modules/search/search.module 6 Oct 2008 12:55:54 -0000 1.267 +++ modules/search/search.module 9 Oct 2008 05:51:18 -0000 @@ -570,8 +570,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/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 9 Oct 2008 05:51:18 -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/translation/translation.module =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v retrieving revision 1.31 diff -u -p -r1.31 translation.module --- modules/translation/translation.module 9 Oct 2008 04:32:34 -0000 1.31 +++ modules/translation/translation.module 9 Oct 2008 05:51:18 -0000 @@ -248,7 +248,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 9 Oct 2008 05:51:18 -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: 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 9 Oct 2008 05:51:18 -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 9 Oct 2008 05:51:18 -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: