summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-11 00:48:56 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-11 00:48:56 +0000
commit28f8c5e8621591025d82dc0c894b14f957e481f9 (patch)
treea522edf52d61f1ea328e1ebdbb349659c878659b /includes
parentf546cfa1e832487f85f5f42532087cd206c55c7f (diff)
downloadbrdo-28f8c5e8621591025d82dc0c894b14f957e481f9.tar.gz
brdo-28f8c5e8621591025d82dc0c894b14f957e481f9.tar.bz2
#424372 by mr.baileys: Fix ':: in .info files causes fatal error' bug.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 6bce4c599..4f19a63b5 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5944,6 +5944,7 @@ function drupal_parse_info_file($filename) {
*/
function drupal_parse_info_format($data) {
$info = array();
+ $constants = get_defined_constants();
if (preg_match_all('
@^\s* # Start at the beginning of a line, ignoring leading whitespace
@@ -5982,8 +5983,8 @@ function drupal_parse_info_format($data) {
$parent = &$parent[$key];
}
- // Handle PHP constants
- if (defined($value)) {
+ // Handle PHP constants.
+ if (isset($constants[$value])) {
$value = constant($value);
}