? .DS_Store
? drupal_static_isset.patch
? formatting.patch
? head.db
? not_contains.patch
? not_contains_test.patch
? not_contains_test.patch.txt
? not_contains_test_0.patch
? sites/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.404
diff -u -p -r1.404 bootstrap.inc
--- includes/bootstrap.inc	28 Jun 2010 19:57:34 -0000	1.404
+++ includes/bootstrap.inc	29 Jun 2010 15:37:03 -0000
@@ -2915,7 +2915,7 @@ function &drupal_static($name, $default_
   }
   if ($reset) {
     // The reset means the default is loaded.
-    if (array_key_exists($name, $default)) {
+    if (isset($default[$name]) || array_key_exists($name, $default)) {
       $data[$name] = $default[$name];
     }
     else {
@@ -2924,7 +2924,7 @@ function &drupal_static($name, $default_
       return $data;
     }
   }
-  elseif (!array_key_exists($name, $data)) {
+  elseif (!isset($data[$name]) || !array_key_exists($name, $data)) {
     // Store the default value internally and also copy it to the reference to
     // be returned.
     $default[$name] = $data[$name] = $default_value;