Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
783caf38
Commit
783caf38
authored
Jan 25, 2013
by
webchick
Browse files
Issue
#1898236
by TwoD: Fixed Installing without English language leads to Fatal Error.
parent
ba6d3fb7
Changes
1
Hide whitespace changes
Inline
Side-by-side
core/includes/bootstrap.inc
View file @
783caf38
...
...
@@ -888,18 +888,18 @@ function drupal_get_filename($type, $name, $filename = NULL) {
// nothing
}
else
{
if
(
$type
==
'module'
)
{
if
(
empty
(
$files
[
$type
]))
{
$files
[
$type
]
=
drupal_container
()
->
get
(
'module_handler'
)
->
getModuleList
();
}
if
(
isset
(
$files
[
$type
][
$name
]))
{
return
$files
[
$type
][
$name
];
}
}
// Verify that we have an keyvalue service before using it. This is required
// because this function is called during installation.
// @todo Inject database connection into KeyValueStore\DatabaseStorage.
if
((
$container
=
drupal_container
())
&&
$container
->
has
(
'keyvalue'
)
&&
function_exists
(
'db_query'
))
{
if
(
$type
==
'module'
)
{
if
(
empty
(
$files
[
$type
]))
{
$files
[
$type
]
=
drupal_container
()
->
get
(
'module_handler'
)
->
getModuleList
();
}
if
(
isset
(
$files
[
$type
][
$name
]))
{
return
$files
[
$type
][
$name
];
}
}
try
{
$file_list
=
state
()
->
get
(
'system.'
.
$type
.
'.files'
);
if
(
$file_list
&&
isset
(
$file_list
[
$name
])
&&
file_exists
(
DRUPAL_ROOT
.
'/'
.
$file_list
[
$name
]))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment