diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 4c7223e..8778f33 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -1463,13 +1463,13 @@ function t($string, array $args = array(), array $options = array()) { // actually enabled and its database tables are installed. Since PHP code // cannot be unloaded, this is typically the case in the environment that // is executing a test. - // - Whether Locale module actually has been loaded. + // - Whether Locale module actually has been loaded and locale() exists. // The Locale module may be enabled, but the actual .module might not be // loaded. This is typically the case in update.php, which needs to // populate the full module list to invoke hook_requirements(), but must // not load any actual modules and APIs, since they are not guaranteed to // be operational. - $locale_exists = function_exists('module_exists') && module_exists('locale') && function_exists('locale'); + $locale_exists = function_exists('locale') && function_exists('module_exists') && module_exists('locale'); } // Merge in default.