Index: modules/comment/comment.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.install,v
retrieving revision 1.14
diff -u -p -r1.14 comment.install
--- modules/comment/comment.install	17 Dec 2007 12:23:00 -0000	1.14
+++ modules/comment/comment.install	17 Dec 2007 16:25:09 -0000
@@ -1,8 +1,6 @@
 <?php
 // $Id: comment.install,v 1.14 2007/12/17 12:23:00 goba Exp $
 
-drupal_load('module', 'comment');
-
 /**
  * Implementation of hook_enable().
  */
@@ -36,6 +34,9 @@ function comment_update_6001() {
  * settings to all node types.
  */
 function comment_update_6002() {
+  // Comment module might not be enabled when this is run, but we need the
+  // constants defined by the module for this update.
+  drupal_load('module', 'comment');
   $settings = array(
     'comment_default_mode' => COMMENT_MODE_THREADED_EXPANDED,
     'comment_default_order' => COMMENT_ORDER_NEWEST_FIRST,