Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal-3443205
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-3443205
Commits
0506d2cb
Commit
0506d2cb
authored
10 years ago
by
Alex Pott
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#2370733
by chx: Fixed Contrib can not provide config storage.
parent
338c7914
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/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
+9
-3
9 additions, 3 deletions
.../lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
core/lib/Drupal/Core/DrupalKernel.php
+1
-1
1 addition, 1 deletion
core/lib/Drupal/Core/DrupalKernel.php
with
10 additions
and
4 deletions
core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
+
9
−
3
View file @
0506d2cb
...
...
@@ -18,16 +18,22 @@ class BootstrapConfigStorageFactory {
/**
* Returns a configuration storage implementation.
*
* @param $class_loader
* The class loader. Normally Composer's ClassLoader, as included by the
* front controller, but may also be decorated; e.g.,
* \Symfony\Component\ClassLoader\ApcClassLoader.
*
* @return \Drupal\Core\Config\StorageInterface
* A configuration storage implementation.
*/
public
static
function
get
()
{
public
static
function
get
(
$class_loader
=
NULL
)
{
$bootstrap_config_storage
=
Settings
::
get
(
'bootstrap_config_storage'
);
$storage_backend
=
FALSE
;
if
(
!
empty
(
$bootstrap_config_storage
)
&&
is_callable
(
$bootstrap_config_storage
))
{
return
call_user_func
(
$bootstrap_config_storage
);
$storage_backend
=
call_user_func
(
$bootstrap_config_storage
,
$class_loader
);
}
// Fallback to the DatabaseStorage.
return
self
::
getDatabaseStorage
();
return
$storage_backend
?:
self
::
getDatabaseStorage
();
}
/**
...
...
This diff is collapsed.
Click to expand it.
core/lib/Drupal/Core/DrupalKernel.php
+
1
−
1
View file @
0506d2cb
...
...
@@ -1171,7 +1171,7 @@ protected function getConfigStorage() {
// The active configuration storage may not exist yet; e.g., in the early
// installer. Catch the exception thrown by config_get_config_directory().
try
{
$this
->
configStorage
=
BootstrapConfigStorageFactory
::
get
();
$this
->
configStorage
=
BootstrapConfigStorageFactory
::
get
(
$this
->
classLoader
);
}
catch
(
\Exception
$e
)
{
$this
->
configStorage
=
new
NullStorage
();
...
...
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