Commit 6810dfa8 authored by catch's avatar catch
Browse files

Issue #1864292 by effulgentsia: Fixed Installation in non-English language fails.

parent 56a7c639
......@@ -899,7 +899,7 @@ function drupal_get_filename($type, $name, $filename = NULL) {
// 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 (drupal_container()->has('keyvalue') && function_exists('db_query')) {
if (($container = drupal_container()) && $container->has('keyvalue') && function_exists('db_query')) {
try {
$file_list = state()->get('system.' . $type . '.files');
if ($file_list && isset($file_list[$name]) && file_exists(DRUPAL_ROOT . '/' . $file_list[$name])) {
......
......@@ -165,7 +165,7 @@ public function setURI($uri) {
*/
public function open() {
if (!empty($this->_uri)) {
$this->_fd = fopen(drupal_realpath($this->_uri), 'rb');
$this->_fd = fopen($this->_uri, 'rb');
$this->_size = ftell($this->_fd);
$this->readHeader();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment