? sites/default/modules ? sites/default/settings.php Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.247 diff -u -p -r1.247 bootstrap.inc --- includes/bootstrap.inc 11 Nov 2008 22:39:58 -0000 1.247 +++ includes/bootstrap.inc 12 Nov 2008 14:29:34 -0000 @@ -207,12 +207,12 @@ define('CHECK_PLAIN', 0); define('PASS_THROUGH', -1); /** - * Signals that the registry lookup cache should be reset. + * Signals that the registry lookup cache should be reset. */ define('REGISTRY_RESET_LOOKUP_CACHE', 1); /** - * Signals that the registry lookup cache should be written to storage. + * Signals that the registry lookup cache should be written to storage. */ define('REGISTRY_WRITE_LOOKUP_CACHE', 2); @@ -1467,7 +1467,7 @@ function drupal_autoload_class($class) { * Helper to check for a resource in the registry. * * @param $type - * The type of resource we are looking up, or one of the constants + * The type of resource we are looking up, or one of the constants * REGISTRY_RESET_LOOKUP_CACHE or REGISTRY_WRITE_LOOKUP_CACHE, which * signal that we should reset or write the cache, respectively. * @param $name @@ -1483,7 +1483,7 @@ function _registry_check_code($type, $na if (!isset($lookup_cache)) { $lookup_cache = _registry_get_lookup_cache(); } - + // When we rebuild the registry, we need to reset this cache so // we don't keep lookups for resources that changed during the rebuild. if ($type == REGISTRY_RESET_LOOKUP_CACHE) { @@ -1500,8 +1500,8 @@ function _registry_check_code($type, $na } return; } - - // $type can be one of 'function', 'interface' or 'class', so we only need the + + // $type can be one of 'function', 'interface' or 'class', so we only need the // first letter to keep the cache key unique. $cache_key = $type[0] . $name; if (isset($lookup_cache[$cache_key])) { @@ -1510,7 +1510,7 @@ function _registry_check_code($type, $na } return $lookup_cache[$cache_key]; } - + // This function may get called when the default database is not active, but // there is no reason we'd ever want to not use the default database for // this query. @@ -1551,7 +1551,7 @@ function registry_rebuild() { * Wrapper function to perform array to string conversion of lookup cache. */ function _registry_set_lookup_cache(array $lookup_cache) { - // Cache a string, not an array, so we can avoid the memory usage hit + // Cache a string, not an array, so we can avoid the memory usage hit // from serialize() in the cache system. $key_value_pairs = array(); foreach ($lookup_cache as $key => $value) { @@ -1564,7 +1564,7 @@ function _registry_set_lookup_cache(arra * Wrapper function to perform string to array conversion of lookup cache. */ function _registry_get_lookup_cache() { - // In _registry_set_lookup_cache, we cache a string, not an array, to avoid + // In _registry_set_lookup_cache, we cache a string, not an array, to avoid // serialize() in the cache system. serialize() makes a copy, and thus uses // extra memory, which we are trying to avoid. $lookup_cache = array(); Index: includes/registry.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/registry.inc,v retrieving revision 1.8 diff -u -p -r1.8 registry.inc --- includes/registry.inc 11 Nov 2008 22:39:58 -0000 1.8 +++ includes/registry.inc 12 Nov 2008 14:29:34 -0000 @@ -73,7 +73,7 @@ function _registry_rebuild() { $unchanged_resources = array(); foreach (_registry_get_lookup_cache() as $key => $file) { - // If the file for this cached resource is carried over unchanged from + // If the file for this cached resource is carried over unchanged from // the last registry build, then we can safely re-cache it. if ($file && in_array($file, array_keys($files)) && !in_array($file, $parsed_files)) { $unchanged_resources[$key] = $file; Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.662 diff -u -p -r1.662 comment.module --- modules/comment/comment.module 11 Nov 2008 21:44:01 -0000 1.662 +++ modules/comment/comment.module 12 Nov 2008 14:29:35 -0000 @@ -370,16 +370,16 @@ function comment_new_page_count($num_com else { // Threaded comments. // Find the first thread with a new comment. - $result = db_query_range('(SELECT thread - FROM {comments} - WHERE nid = :nid - AND status = 0 - ORDER BY timestamp DESC) + $result = db_query_range('(SELECT thread + FROM {comments} + WHERE nid = :nid + AND status = 0 + ORDER BY timestamp DESC) ORDER BY SUBSTRING(thread, 1, (LENGTH(thread) - 1))', array(':nid' => $node->nid), 0, $new_replies) ->fetchField(); $thread = substr($result, 0, -1); $count = db_query('SELECT COUNT(*) FROM {comments} WHERE nid = :nid AND status = 0 AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < :thread', array( - ':nid' => $node->nid, + ':nid' => $node->nid, ':thread' => $thread)) ->fetchField(); $pageno = $count / $comments_per_page; @@ -763,7 +763,7 @@ function comment_save($edit) { $parent->thread = (string) rtrim((string) $parent->thread, '/'); // Get the max value in *this* thread. $max = db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE :thread AND nid = :nid", array( - ':thread' => $parent->thread .'.%', + ':thread' => $parent->thread . '.%', ':nid' => $edit['nid'])) ->fetchField(); @@ -1006,7 +1006,7 @@ function comment_render($node, $cid = 0) } } else { - + //TODO Convert to dynamic queries once the pager query is updated to the new DBTNG API. // Multiple comment view. @@ -1150,7 +1150,7 @@ function comment_num_replies($pid) { if (!isset($cache[$pid])) { $cache[$pid] = db_query('SELECT COUNT(cid) FROM {comments} WHERE pid = :pid AND status = :status', array( - ':pid' => $pid, + ':pid' => $pid, ':status' => COMMENT_PUBLISHED)) ->fetchField(); } Index: modules/comment/comment.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v retrieving revision 1.8 diff -u -p -r1.8 comment.pages.inc --- modules/comment/comment.pages.inc 11 Nov 2008 21:44:01 -0000 1.8 +++ modules/comment/comment.pages.inc 12 Nov 2008 14:29:35 -0000 @@ -70,7 +70,7 @@ function comment_reply($node, $pid = NUL if ($pid) { // Load the comment whose cid = $pid $comment = db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = :cid AND c.status = :status', array( - ':cid'=>$pid, + ':cid'=>$pid, ':status'=>COMMENT_PUBLISHED))->fetchObject(); if ( $comment ) { // If that comment exists, make sure that the current comment and the 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 Nov 2008 14:29:35 -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: