Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.904
diff -u -r1.904 common.inc
--- includes/common.inc	16 May 2009 19:58:38 -0000	1.904
+++ includes/common.inc	18 May 2009 08:53:31 -0000
@@ -384,7 +384,7 @@
  */
 function drupal_access_denied() {
   drupal_set_header('403 Forbidden');
-  
+
   watchdog('access denied', check_plain($_GET['q']), NULL, WATCHDOG_WARNING);
 
   $path = drupal_get_normal_path(variable_get('site_403', ''));
@@ -1927,7 +1927,7 @@
 /**
  * Return the base URL path (i.e., directory) of the Drupal installation.
  *
- * base_path() prefixes and suffixes a "/" onto the returned path if the path is 
+ * base_path() prefixes and suffixes a "/" onto the returned path if the path is
  * not empty. At the very least, this will return "/".
  *
  * Examples:
@@ -2279,7 +2279,7 @@
  * @return
  *   Contents of the stylesheet including the imported stylesheets.
  */
-function drupal_load_stylesheet_content($contents, $optimize = FALSE) {  
+function drupal_load_stylesheet_content($contents, $optimize = FALSE) {
   // Replaces @import commands with the actual stylesheet content.
   // This happens recursively but omits external files.
   $contents = preg_replace_callback('/@import\s*(?:url\()?[\'"]?(?![a-z]+:)([^\'"\()]+)[\'"]?\)?;/', '_drupal_load_stylesheet', $contents);
@@ -4075,6 +4075,7 @@
  */
 function drupal_parse_info_file($filename) {
   $info = array();
+  $constants = get_defined_constants();
 
   if (!file_exists($filename)) {
     return $info;
@@ -4119,7 +4120,7 @@
       }
 
       // Handle PHP constants
-      if (defined($value)) {
+      if (array_key_exists($value, $constants)) {
         $value = constant($value);
       }