projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
web
/
core
/
modules
/
config
/
src
/
ConfigSubscriber.php
diff --git
a/web/core/modules/config/src/ConfigSubscriber.php
b/web/core/modules/config/src/ConfigSubscriber.php
index 94405a1cd08289e75c30115f067f734665a9d364..779bab67ddcbb71c8dbb567f9842c0811eb29fa4 100644
(file)
--- a/
web/core/modules/config/src/ConfigSubscriber.php
+++ b/
web/core/modules/config/src/ConfigSubscriber.php
@@
-6,7
+6,6
@@
use Drupal\Core\Config\ConfigEvents;
use Drupal\Core\Config\ConfigImporterEvent;
use Drupal\Core\Config\ConfigImportValidateEventSubscriberBase;
use Drupal\Core\Config\ConfigImporterEvent;
use Drupal\Core\Config\ConfigImportValidateEventSubscriberBase;
-
/**
* Config subscriber.
*/
/**
* Config subscriber.
*/
@@
-15,10
+14,15
@@
class ConfigSubscriber extends ConfigImportValidateEventSubscriberBase {
/**
* Checks that the Configuration module is not being uninstalled.
*
/**
* Checks that the Configuration module is not being uninstalled.
*
- * @param ConfigImporterEvent $event
+ * @param
\Drupal\Core\Config\
ConfigImporterEvent $event
* The config import event.
*/
public function onConfigImporterValidate(ConfigImporterEvent $event) {
* The config import event.
*/
public function onConfigImporterValidate(ConfigImporterEvent $event) {
+ // Make sure config syncs performed via the Config UI don't break, but
+ // don't worry about syncs initiated via the command line.
+ if (PHP_SAPI === 'cli') {
+ return;
+ }
$importer = $event->getConfigImporter();
$core_extension = $importer->getStorageComparer()->getSourceStorage()->read('core.extension');
if (!isset($core_extension['module']['config'])) {
$importer = $event->getConfigImporter();
$core_extension = $importer->getStorageComparer()->getSourceStorage()->read('core.extension');
if (!isset($core_extension['module']['config'])) {