Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal-3174996
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
drupal-3174996
Commits
600a17e8
Commit
600a17e8
authored
12 years ago
by
Katherine Bailey
Browse files
Options
Downloads
Patches
Plain Diff
Make installation work
parent
8b2e986c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/includes/bootstrap.inc
+29
-3
29 additions, 3 deletions
core/includes/bootstrap.inc
core/includes/install.core.inc
+3
-0
3 additions, 0 deletions
core/includes/install.core.inc
with
32 additions
and
3 deletions
core/includes/bootstrap.inc
+
29
−
3
View file @
600a17e8
...
...
@@ -6,6 +6,7 @@
use
Symfony\Component\ClassLoader\ApcUniversalClassLoader
;
use
Symfony\Component\DependencyInjection\Container
;
use
Symfony\Component\DependencyInjection\ContainerBuilder
;
use
Symfony\Component\DependencyInjection\Reference
;
use
Symfony\Component\HttpFoundation\Request
;
use
Drupal\Core\Language\Language
;
...
...
@@ -2459,14 +2460,39 @@ function drupal_container(Container $reset = NULL) {
$container
=
$reset
;
}
elseif
(
!
isset
(
$container
))
{
// This will only ever happen if an error has been thrown. Just build a new
// ContainerBuilder with only the language_interface service.
// During a normal page request, as opposed to during installation, this will only
// ever happen if an error has been thrown. We need to build a new ContainerBuilder
// with only the language_interface service.
$container
=
new
ContainerBuilder
();
// An interface language always needs to be available for t() and other
// functions. This default is overridden by drupal_language_initialize()
// during language negotiation.
$container
->
register
(
LANGUAGE_TYPE_INTERFACE
,
'Drupal\\Core\\Language\\Language'
);
// If we are at the beginning of the installation process, we also need the config
// services.
if
(
variable_get
(
'install_task'
,
''
)
!=
'done'
)
{
// Register configuration storage dispatcher.
$container
->
setParameter
(
'config.storage.info'
,
array
(
'Drupal\Core\Config\DatabaseStorage'
=>
array
(
'connection'
=>
'default'
,
'target'
=>
'default'
,
'read'
=>
TRUE
,
'write'
=>
TRUE
,
),
'Drupal\Core\Config\FileStorage'
=>
array
(
'directory'
=>
config_get_config_directory
(),
'read'
=>
TRUE
,
'write'
=>
FALSE
,
),
));
$container
->
register
(
'config.storage.dispatcher'
,
'Drupal\Core\Config\StorageDispatcher'
)
->
addArgument
(
'%config.storage.info%'
);
// Register configuration object factory.
$container
->
register
(
'config.factory'
,
'Drupal\Core\Config\ConfigFactory'
)
->
addArgument
(
new
Reference
(
'config.storage.dispatcher'
));
}
}
return
$container
;
}
...
...
This diff is collapsed.
Click to expand it.
core/includes/install.core.inc
+
3
−
0
View file @
600a17e8
<?php
use
Drupal\Core\DrupalKernel
;
use
Drupal\Core\Database\Database
;
use
Drupal\Core\Database\Install\TaskException
;
...
...
@@ -1416,6 +1417,8 @@ function install_bootstrap_full(&$install_state) {
// Clear the module list that was overriden earlier in the process.
// This will allow all freshly installed modules to be loaded.
module_list_reset
();
$kernel
=
new
DrupalKernel
(
'prod'
,
FALSE
);
$kernel
->
boot
();
drupal_bootstrap
(
DRUPAL_BOOTSTRAP_FULL
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment