Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.132
diff -u -F^f -r1.132 menu.inc
--- includes/menu.inc	31 Jul 2006 11:25:52 -0000	1.132
+++ includes/menu.inc	20 Aug 2006 03:53:06 -0000
@@ -591,7 +591,7 @@ function menu_rebuild() {
 
   _menu_build();
 
-  if (module_exist('menu')) {
+  if (module_exists('menu')) {
     $menu = menu_get_menu();
 
     // Fill a queue of new menu items which are modifiable.
@@ -828,7 +828,7 @@ function theme_menu_local_task($mid, $ac
  *   -active is appended if this element is in the active trail.
  */
 function menu_primary_links($start_level = 1, $pid = 0) {
-  if (!module_exist('menu')) {
+  if (!module_exists('menu')) {
     return NULL;
   }
   if (!$pid) {
@@ -1081,7 +1081,7 @@ function _menu_build() {
   }
 
   // Now fetch items from the DB, reassigning menu IDs as needed.
-  if (module_exist('menu')) {
+  if (module_exists('menu')) {
     $result = db_query(db_rewrite_sql('SELECT m.mid, m.* FROM {menu} m ORDER BY m.mid ASC', 'm', 'mid'));
     while ($item = db_fetch_object($result)) {
       // Handle URL aliases if entered in menu administration.
Index: includes/module.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/module.inc,v
retrieving revision 1.81
diff -u -F^f -r1.81 module.inc
--- includes/module.inc	3 Aug 2006 07:06:36 -0000	1.81
+++ includes/module.inc	20 Aug 2006 03:53:07 -0000
@@ -136,7 +136,7 @@ function module_rebuild_cache() {
  * @return
  *   TRUE if the module is both installed and enabled.
  */
-function module_exist($module) {
+function module_exists($module) {
   $list = module_list();
   return array_key_exists($module, $list);
 }
@@ -181,7 +181,7 @@ function module_enable($module) {
  *   The name of the module (without the .module extension).
  */
 function module_disable($module) {
-  if (module_exist($module)) {
+  if (module_exists($module)) {
     module_load_install($module);
     module_invoke($module, 'disable');
     db_query("UPDATE {system} SET status = 0, throttle = 0 WHERE type = 'module' AND name = '%s'", $module);
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.308
diff -u -F^f -r1.308 theme.inc
--- includes/theme.inc	18 Aug 2006 12:16:57 -0000	1.308
+++ includes/theme.inc	20 Aug 2006 03:53:08 -0000
@@ -244,7 +244,7 @@ function theme_get_settings($key = NULL)
     'toggle_comment_user_picture'   =>  0,
   );
 
-  if (module_exist('node')) {
+  if (module_exists('node')) {
     foreach (node_get_types() as $type => $name) {
       $defaults['toggle_node_info_' . $type] = 1;
     }
@@ -256,7 +256,7 @@ function theme_get_settings($key = NULL)
   }
 
   // Only offer search box if search.module is enabled.
-  if (!module_exist('search') || !user_access('search content')) {
+  if (!module_exists('search') || !user_access('search content')) {
     $settings['toggle_search'] = 0;
   }
 
@@ -600,7 +600,7 @@ function theme_node($node, $teaser = FAL
     $output  = '<div class="node-unpublished">';
   }
 
-  if (module_exist('taxonomy')) {
+  if (module_exists('taxonomy')) {
     $terms = taxonomy_link('taxonomy terms', $node);
   }
 
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.299
diff -u -F^f -r1.299 aggregator.module
--- modules/aggregator/aggregator.module	18 Aug 2006 18:58:44 -0000	1.299
+++ modules/aggregator/aggregator.module	20 Aug 2006 03:53:11 -0000
@@ -1325,7 +1325,7 @@ function theme_aggregator_feed($feed) {
 function theme_aggregator_block_item($item, $feed = 0) {
   global $user;
 
-  if ($user->uid && module_exist('blog') && user_access('edit own blog')) {
+  if ($user->uid && module_exists('blog') && user_access('edit own blog')) {
     if ($image = theme('image', 'misc/blog.png', t('blog it'), t('blog it'))) {
       $output .= '<div class="icon">'. l($image, 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid", NULL, FALSE, TRUE) .'</div>';
     }
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.216
diff -u -F^f -r1.216 block.module
--- modules/block/block.module	18 Aug 2006 18:58:44 -0000	1.216
+++ modules/block/block.module	20 Aug 2006 03:53:14 -0000
@@ -221,7 +221,7 @@ function block_admin_display($theme = NU
   $blocks = _block_rehash();
   usort($blocks, '_block_compare');
 
-  $throttle = module_exist('throttle');
+  $throttle = module_exists('throttle');
   $block_regions = system_region_list($theme_key);
 
   // Build form tree
@@ -295,7 +295,7 @@ function block_admin_display_submit($for
 function theme_block_admin_display($form) {
   global $theme_key;
 
-  $throttle = module_exist('throttle');
+  $throttle = module_exists('throttle');
   $block_regions = system_region_list($theme_key);
 
   // Highlight regions on page to provide visual reference.
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.62
diff -u -F^f -r1.62 contact.module
--- modules/contact/contact.module	18 Aug 2006 18:58:45 -0000	1.62
+++ modules/contact/contact.module	20 Aug 2006 03:53:15 -0000
@@ -27,7 +27,7 @@ function contact_help($section) {
       return t('Enables the use of both personal and site-wide contact forms.');
     case 'admin/build/contact':
       $output = t('This page lets you setup <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact')));
-      if (!module_exist('menu')) {
+      if (!module_exists('menu')) {
         $menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/settings/modules')));
       }
       else {
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.349
diff -u -F^f -r1.349 forum.module
--- modules/forum/forum.module	18 Aug 2006 18:58:45 -0000	1.349
+++ modules/forum/forum.module	20 Aug 2006 03:53:16 -0000
@@ -851,7 +851,7 @@ function _forum_new($tid) {
  * Menu callback; prints a forum listing.
  */
 function forum_page($tid = 0) {
-  if (module_exist('taxonomy') && module_exist('comment')) {
+  if (module_exists('taxonomy') && module_exists('comment')) {
     $forum_per_page = variable_get('forum_per_page', 25);
     $sortby = variable_get('forum_order', 1);
 
@@ -908,7 +908,7 @@ function theme_forum_display($forums, $t
     $output  = '<div id="forum">';
     $output .= '<ul>';
 
-    if (module_exist('tracker')) {
+    if (module_exists('tracker')) {
       if ($user->uid) {
         $output .= ' <li>'. l(t('My discussions.'), "tracker/$user->uid") .'</li>';
       }
Index: modules/legacy/legacy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/legacy/legacy.module,v
retrieving revision 1.12
diff -u -F^f -r1.12 legacy.module
--- modules/legacy/legacy.module	18 Aug 2006 12:16:58 -0000	1.12
+++ modules/legacy/legacy.module	20 Aug 2006 03:53:17 -0000
@@ -198,5 +198,3 @@ function _legacy_filter_old_urls($text) 
 
   return $text;
 }
-
-
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.677
diff -u -F^f -r1.677 node.module
--- modules/node/node.module	19 Aug 2006 21:40:58 -0000	1.677
+++ modules/node/node.module	20 Aug 2006 03:53:21 -0000
@@ -785,10 +785,10 @@ function node_search($op = 'search', $ke
 
       $ranking = array('node_rank_relevance' => t('Keyword relevance'),
                        'node_rank_recent' => t('Recently posted'));
-      if (module_exist('comment')) {
+      if (module_exists('comment')) {
         $ranking['node_rank_comments'] = t('Number of comments');
       }
-      if (module_exist('statistics') && variable_get('statistics_count_content_views', 0)) {
+      if (module_exists('statistics') && variable_get('statistics_count_content_views', 0)) {
         $ranking['node_rank_views'] = t('Number of views');
       }
 
@@ -846,7 +846,7 @@ function node_search($op = 'search', $ke
         $join2 .= ' INNER JOIN {node} n ON n.nid = i.sid LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
         $stats_join = TRUE;
       }
-      if (module_exist('comment') && $weight = (int)variable_get('node_rank_comments', 5)) {
+      if (module_exists('comment') && $weight = (int)variable_get('node_rank_comments', 5)) {
         // Inverse law that maps the highest reply count on the site to 1 and 0 to 0.
         $scale = variable_get('node_cron_comments_scale', 0.0);
         $ranking[] = '%d * (2.0 - 2.0 / (1.0 + c.comment_count * %f))';
@@ -856,7 +856,7 @@ function node_search($op = 'search', $ke
           $join2 .= ' LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
         }
       }
-      if (module_exist('statistics') && variable_get('statistics_count_content_views', 0) &&
+      if (module_exists('statistics') && variable_get('statistics_count_content_views', 0) &&
           $weight = (int)variable_get('node_rank_views', 5)) {
         // Inverse law that maps the highest view count on the site to 1 and 0 to 0.
         $scale = variable_get('node_cron_views_scale', 0.0);
@@ -1011,7 +1011,7 @@ function node_menu($may_cache) {
     $items[] = array('path' => 'admin/content/node/overview', 'title' => t('list'),
       'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
 
-    if (module_exist('search')) {
+    if (module_exists('search')) {
       $items[] = array('path' => 'admin/content/search', 'title' => t('search posts'),
         'description' => t('Search posts by keyword.'),
         'callback' => 'node_admin_search',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.347
diff -u -F^f -r1.347 system.module
--- modules/system/system.module	18 Aug 2006 18:58:46 -0000	1.347
+++ modules/system/system.module	20 Aug 2006 03:53:24 -0000
@@ -1233,7 +1233,7 @@ function system_modules() {
   /**
    * Handle throttle checkboxes, including overriding the generated checkboxes for required modules.
    */
-  if (module_exist('throttle')) {
+  if (module_exists('throttle')) {
     $form['throttle'] = array('#type' => 'checkboxes', '#default_value' => $throttle, '#options' => $options);
     $throttle_required = array_merge($required, array('throttle'));
     foreach ($throttle_required as $require) {
@@ -1253,14 +1253,14 @@ function theme_system_modules($form) {
     $row[] = drupal_render($form['description'][$key]);
     $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center');
 
-    if (module_exist('throttle')) {
+    if (module_exists('throttle')) {
       $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center');
     }
     $rows[] = $row;
   }
 
   $header = array(t('Name'), t('Description'), t('Enabled'));
-  if (module_exist('throttle')) {
+  if (module_exists('throttle')) {
     $header[] = t('Throttle');
   }
 
@@ -1399,7 +1399,7 @@ function system_theme_settings($key = ''
     $disabled['toggle_node_user_picture'] = TRUE;
     $disabled['toggle_comment_user_picture'] = TRUE;
   }
-  if (!module_exist('search')) {
+  if (!module_exists('search')) {
     $disabled['toggle_search'] = TRUE;
   }
 
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.303
diff -u -F^f -r1.303 taxonomy.module
--- modules/taxonomy/taxonomy.module	18 Aug 2006 18:58:46 -0000	1.303
+++ modules/taxonomy/taxonomy.module	20 Aug 2006 03:53:26 -0000
@@ -20,7 +20,7 @@ function taxonomy_perm() {
  * print lists of terms associated with a node. Themes can print taxonomy
  * links with:
  *
- * if (module_exist('taxonomy')) {
+ * if (module_exists('taxonomy')) {
  *   $this->links(taxonomy_link('taxonomy terms', $node));
  * }
  */
Index: modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.134
diff -u -F^f -r1.134 tracker.module
--- modules/tracker/tracker.module	18 Aug 2006 12:16:59 -0000	1.134
+++ modules/tracker/tracker.module	20 Aug 2006 03:53:28 -0000
@@ -104,7 +104,7 @@ function tracker_page($uid = 0) {
   while ($node = db_fetch_object($result)) {
     // Determine the number of comments:
     $comments = 0;
-    if (module_exist('comment') && $node->comment_count) {
+    if (module_exists('comment') && $node->comment_count) {
       $comments = $node->comment_count;
 
       if ($new = comment_num_new($node->nid)) {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.656
diff -u -F^f -r1.656 user.module
--- modules/user/user.module	18 Aug 2006 18:58:47 -0000	1.656
+++ modules/user/user.module	20 Aug 2006 03:53:32 -0000
@@ -743,7 +743,7 @@ function user_menu($may_cache) {
       'callback' => 'drupal_get_form', 'callback arguments' => array('user_admin_access_delete_confirm'),
       'access' => $access_access, 'type' => MENU_CALLBACK);
 
-    if (module_exist('search')) {
+    if (module_exists('search')) {
       $items[] = array('path' => 'admin/user/search', 'title' => t('search users'),
         'description' => t('Search users by name.'),
         'callback' => 'user_admin', 'callback arguments' => array('search'), 'access' => $admin_access,
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.46
diff -u -F^f -r1.46 chameleon.theme
--- themes/chameleon/chameleon.theme	3 Aug 2006 07:06:36 -0000	1.46
+++ themes/chameleon/chameleon.theme	20 Aug 2006 03:53:33 -0000
@@ -135,7 +135,7 @@ function chameleon_node($node, $teaser =
   $submitted['node_submitted'] = theme_get_setting("toggle_node_info_$node->type") ? array('#title' => t("By %author at %date", array('%author' => theme('username', $node), '%date' => format_date($node->created, 'small')))) : array();
 
   $terms = array();
-  if (module_exist('taxonomy')) {
+  if (module_exists('taxonomy')) {
     $terms = taxonomy_link("taxonomy terms", $node);
   }
 
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.42
diff -u -F^f -r1.42 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	18 Aug 2006 19:16:01 -0000	1.42
+++ themes/engines/phptemplate/phptemplate.engine	20 Aug 2006 03:53:36 -0000
@@ -253,7 +253,7 @@ function phptemplate_page($content) {
  * into a pluggable template engine.
  */
 function phptemplate_node($node, $teaser = 0, $page = 0) {
-  if (module_exist('taxonomy')) {
+  if (module_exists('taxonomy')) {
     $taxonomy = taxonomy_link('taxonomy terms', $node);
   }
   else {
Index: modules/devel/devel.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/devel/devel.module,v
retrieving revision 1.102
diff -u -F^f -r1.102 devel.module
--- modules/devel/devel.module	17 Aug 2006 13:39:22 -0000	1.102
+++ modules/devel/devel.module	20 Aug 2006 03:53:38 -0000
@@ -63,7 +63,7 @@ function devel_menu($may_cache) {
       'access' => user_access('access devel information'),
       'type' => MENU_CALLBACK,
     );
-    if (module_exist('menu')) {
+    if (module_exists('menu')) {
       $items[] = array('path' => 'devel/menu/reset',
         'title' => t('reset menus'),
         'callback' => 'devel_menu_reset_form',
Index: modules/devel/generate/generate-content.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/devel/generate/generate-content.php,v
retrieving revision 1.13
diff -u -F^f -r1.13 generate-content.php
--- modules/devel/generate/generate-content.php	9 Aug 2006 08:05:57 -0000	1.13
+++ modules/devel/generate/generate-content.php	20 Aug 2006 03:53:38 -0000
@@ -12,7 +12,7 @@ function create_nodes($records, $users) 
   $possible_types = array("story", "blog", "forum", "page");
   // Only use types that exist.
   foreach ($possible_types as $type) {
-    if (module_exist($type)) {
+    if (module_exists($type)) {
       $types[] = $type;
     }
   }
Index: modules/pathauto/pathauto.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v
retrieving revision 1.24
diff -u -F^f -r1.24 pathauto.module
--- modules/pathauto/pathauto.module	8 May 2006 12:14:15 -0000	1.24
+++ modules/pathauto/pathauto.module	20 Aug 2006 03:53:39 -0000
@@ -38,7 +38,7 @@ function pathauto_settings() {
   $output = '';
 
   // Insist that path.module be enabled
-  if (!module_exist('path')) {
+  if (!module_exists('path')) {
     $form['error'] = array('#type' => 'item',
       '#title' => t('<p>The pathauto module is an extension of the <b>path</b> '.
       'module - you must <a href="admin/modules">enable <b>path</b></a> to use it.</p>'));
Index: modules/pathauto/pathauto_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto_node.inc,v
retrieving revision 1.20
diff -u -F^f -r1.20 pathauto_node.inc
--- modules/pathauto/pathauto_node.inc	8 May 2006 12:14:15 -0000	1.20
+++ modules/pathauto/pathauto_node.inc	20 Aug 2006 03:53:39 -0000
@@ -33,7 +33,7 @@ function node_pathauto($op) {
         t('[week]') => t('The week number (1-52) of the year the node was created.')
       );
 
-      if (module_exist('taxonomy')) {
+      if (module_exists('taxonomy')) {
         $vocabularies = taxonomy_get_vocabularies();
         if (sizeof($vocabularies) > 0) {
           $settings['placeholders'][t('[vocab]')] =
@@ -49,7 +49,7 @@ function node_pathauto($op) {
         }
       }
       
-      if (module_exist('book')) {
+      if (module_exists('book')) {
         $settings['placeholders'][t('[book]')] = 
           t('For book pages, the title of the top-level book.');
         $settings['placeholders'][t('[bookpath]')] = 
@@ -75,7 +75,7 @@ function node_pathauto($op) {
  * Implementation of hook_nodeapi().
  */
 function pathauto_nodeapi(&$node, $op, $teaser, $page) {
-  if (module_exist('path')) {
+  if (module_exists('path')) {
     switch ($op) {
       case 'insert':
       case 'update':
@@ -137,7 +137,7 @@ function node_get_placeholders($node) {
   $placeholders[t('[user]')] = pathauto_cleanstring($userinfo->name);
   
   // Book title
-  if (module_exist('book') and $node->type == 'book') {
+  if (module_exists('book') and $node->type == 'book') {
     $nodebook = book_load($node);
     $path = book_location($nodebook);
     $placeholders[t('[book]')] = pathauto_cleanstring($path[0]->title);
@@ -157,7 +157,7 @@ function node_get_placeholders($node) {
   }
 
   // And now taxonomy, which is a bit more work
-  if (module_exist('taxonomy') && is_array($node->taxonomy)) {
+  if (module_exists('taxonomy') && is_array($node->taxonomy)) {
     // When editing a node, the taxonomy array might have one or more zero
     // term IDs. Ignore them...
     foreach ($node->taxonomy as $firsttermid) {
@@ -208,7 +208,7 @@ function node_pathauto_bulkupdate() {
   $count = 0;
   $placeholders = array();
   while ($node) {
-    if (module_exist('taxonomy')) {
+    if (module_exists('taxonomy')) {
       // Must populate the terms for the node here for the category
       // placeholders to work
       $node->taxonomy = array_keys(taxonomy_node_get_terms($node->nid));
Index: modules/pathauto/pathauto_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto_taxonomy.inc,v
retrieving revision 1.12
diff -u -F^f -r1.12 pathauto_taxonomy.inc
--- modules/pathauto/pathauto_taxonomy.inc	8 May 2006 12:14:15 -0000	1.12
+++ modules/pathauto/pathauto_taxonomy.inc	20 Aug 2006 03:53:39 -0000
@@ -83,7 +83,7 @@ function pathauto_taxonomy($op, $type, $
             $extplaceholders = module_invoke_all('pathauto_taxonomy', 'values', $category);
             $placeholders = array_merge($placeholders, $extplaceholders);
             
-            if (module_exist('forum')) {
+            if (module_exists('forum')) {
               $forumvid = variable_get('forum_nav_vocabulary', '');
               if ($forumvid == $vid) {
                 $src = 'forum/'.$category->tid;
Index: modules/pathauto/pathauto_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto_user.inc,v
retrieving revision 1.13
diff -u -F^f -r1.13 pathauto_user.inc
--- modules/pathauto/pathauto_user.inc	8 May 2006 12:14:15 -0000	1.13
+++ modules/pathauto/pathauto_user.inc	20 Aug 2006 03:53:40 -0000
@@ -89,11 +89,11 @@ function pathauto_user($op, &$edit, &$us
         $placeholders[t('[uid]')] = $user->uid;
         $src = 'user/'.$user->uid;
         $alias = pathauto_create_alias('user', $op, $placeholders, $src);
-        if (module_exist('blog')) {
+        if (module_exists('blog')) {
           $src = 'blog/'.$user->uid;
           $alias = pathauto_create_alias('blog', $op, $placeholders, $src);
         }
-        if (module_exist('tracker')) {
+        if (module_exists('tracker')) {
           $src = 'user/'.$user->uid.'/track';
           $alias = pathauto_create_alias('tracker', $op, $placeholders, $src);
         }
@@ -106,7 +106,7 @@ function pathauto_user($op, &$edit, &$us
       */
       $user = (object) $user;
       path_set_alias('user/'.$user->uid);
-      if (module_exist('blog')) {
+      if (module_exists('blog')) {
         path_set_alias('blog/'.$user->uid);
       }
       break;