Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.211
diff -u -p -r1.211 bootstrap.inc
--- includes/bootstrap.inc	26 May 2008 17:12:54 -0000	1.211
+++ includes/bootstrap.inc	15 Jun 2008 03:47:33 -0000
@@ -417,8 +417,12 @@ function conf_init() {
  *   The filename of the requested item.
  */
 function drupal_get_filename($type, $name, $filename = NULL) {
+  static $root;
   static $files = array();
 
+  if (isset($root)) {
+    $root = variable_get('root_directory', './');
+  }
   if (!isset($files[$type])) {
     $files[$type] = array();
   }
@@ -452,7 +456,8 @@ function drupal_get_filename($type, $nam
   }
 
   if (isset($files[$type][$name])) {
-    return $files[$type][$name];
+    // Prevent PHP from searching its include directories.
+    return $root . $files[$type][$name];
   }
 }