Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.80
diff -u -r1.80 bootstrap.inc
--- includes/bootstrap.inc	5 Jan 2006 10:51:47 -0000	1.80
+++ includes/bootstrap.inc	15 Jan 2006 17:52:26 -0000
@@ -868,6 +868,15 @@
 
       // Initialize configuration variables, using values from conf.php if available.
       $conf = variable_init(isset($conf) ? $conf : array());
+
+      // Initialize $_GET['q'] prior to loading modules and invoking hook_init().
+      if (!empty($_GET['q'])) {
+        $_GET['q'] = drupal_get_normal_path(trim($_GET['q'], '/'));
+      }
+      else {
+        $_GET['q'] = drupal_get_normal_path(variable_get('site_frontpage', 'node'));
+      }
+
       drupal_page_header();
       break;
 
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.507
diff -u -r1.507 common.inc
--- includes/common.inc	15 Jan 2006 07:14:14 -0000	1.507
+++ includes/common.inc	15 Jan 2006 17:52:28 -0000
@@ -1286,13 +1286,6 @@
   drupal_set_header('Content-Type: text/html; charset=utf-8');
   // Detect string handling method
   unicode_check();
-  // Initialize $_GET['q'] prior to loading modules and invoking hook_init().
-  if (!empty($_GET['q'])) {
-    $_GET['q'] = drupal_get_normal_path(trim($_GET['q'], '/'));
-  }
-  else {
-    $_GET['q'] = drupal_get_normal_path(variable_get('site_frontpage', 'node'));
-  }
   // Initialize all enabled modules.
   module_init();
   // Undo magic quotes