Only in .: moderate_node_track_patch1.txt diff -rup ../drupal-cvs-4-7/modules/node.module ./modules/node.module --- ../drupal-cvs-4-7/modules/node.module Sat Jun 17 13:00:02 2006 +++ ./modules/node.module Sun Jul 2 09:25:03 2006 @@ -632,7 +632,7 @@ function node_search($op = 'search', $ke // Build matching conditions list($join1, $where1) = _db_rewrite_sql(); $arguments1 = array(); - $conditions1 = 'n.status = 1'; + $conditions1 = 'n.status = 1 AND n.moderate = 0'; if ($type = search_query_extract($keys, 'type')) { $types = array(); @@ -1404,7 +1404,7 @@ function node_feed($nodes = 0, $channel global $base_url, $locale; if (!$nodes) { - $nodes = db_query_range(db_rewrite_sql('SELECT n.nid, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.created DESC'), 0, variable_get('feed_default_items', 10)); + $nodes = db_query_range(db_rewrite_sql('SELECT n.nid, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 AND n.moderate = 0 ORDER BY n.created DESC'), 0, variable_get('feed_default_items', 10)); } $item_length = variable_get('feed_item_length', 'teaser'); @@ -1959,7 +1959,7 @@ function node_revisions() { * Generate a listing of promoted nodes. */ function node_page_default() { - $result = pager_query(db_rewrite_sql('SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10)); + $result = pager_query(db_rewrite_sql('SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 AND n.moderate = 0 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10)); if (db_num_rows($result)) { drupal_add_link(array('rel' => 'alternate', diff -rup ../drupal-cvs-4-7/modules/tracker.module ./modules/tracker.module --- ../drupal-cvs-4-7/modules/tracker.module Mon Apr 17 16:48:26 2006 +++ ./modules/tracker.module Sun Jul 2 08:59:24 2006 @@ -90,7 +90,7 @@ function tracker_page($uid = 0) { $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $uid, $uid); } else { - $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_post DESC'; + $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND n.moderate = 0 ORDER BY last_post DESC'; $sql = db_rewrite_sql($sql); $sql_count = 'SELECT COUNT(n.nid) FROM {node} n WHERE n.status = 1'; $sql_count = db_rewrite_sql($sql_count);