Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #532010 by c960657, catch: use require instead of require_once() in _registry_check_code().

merge-requests/26/head
Dries Buytaert 2009-10-26 13:00:54 +00:00
parent c1ce884e4b
commit ccdf82a500
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/bootstrap.inc
View File

@ -1888,6 +1888,10 @@ function drupal_autoload_class($class) {
function _registry_check_code($type, $name = NULL) {
static $lookup_cache, $cache_update_needed;
if ($type == 'class' && class_exists($name) || $type == 'interface' && interface_exists($name)) {
return TRUE;
}
if (!isset($lookup_cache)) {
$lookup_cache = array();
if ($cache = cache_get('lookup_cache', 'cache_registry')) {
@ -1917,9 +1921,9 @@ function _registry_check_code($type, $name = NULL) {
$cache_key = $type[0] . $name;
if (isset($lookup_cache[$cache_key])) {
if ($lookup_cache[$cache_key]) {
require_once DRUPAL_ROOT . '/' . $lookup_cache[$cache_key];
require DRUPAL_ROOT . '/' . $lookup_cache[$cache_key];
}
return $lookup_cache[$cache_key];
return (bool)$lookup_cache[$cache_key];
}
// This function may get called when the default database is not active, but
@ -1939,7 +1943,7 @@ function _registry_check_code($type, $name = NULL) {
$lookup_cache[$cache_key] = $file;
if ($file) {
require_once DRUPAL_ROOT . '/' . $file;
require DRUPAL_ROOT . '/' . $file;
return TRUE;
}
else {