From 191beee5faceacb38ba1fb913cab5e342304b257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Mon, 17 Dec 2007 16:26:12 +0000
Subject: #194310 follow up by chx and myself: only load comment module when we
 can actually do it, and when we need it in comment.install

---
 modules/comment/comment.install | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/comment.install b/modules/comment/comment.install
index 35a1e56a6..0cfc026db 100644
--- a/modules/comment/comment.install
+++ b/modules/comment/comment.install
@@ -1,8 +1,6 @@
 <?php
 // $Id$
 
-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,
-- 
cgit v1.2.3