X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FSystemConfigSubscriber.php;fp=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FSystemConfigSubscriber.php;h=0ab0d15fc6105dd9725adfadf09edf2d36daf14f;hp=519155b8497c9e92a29e2aa3d85b6f867abc540a;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/modules/system/src/SystemConfigSubscriber.php b/web/core/modules/system/src/SystemConfigSubscriber.php
index 519155b84..0ab0d15fc 100644
--- a/web/core/modules/system/src/SystemConfigSubscriber.php
+++ b/web/core/modules/system/src/SystemConfigSubscriber.php
@@ -72,6 +72,9 @@ class SystemConfigSubscriber implements EventSubscriberInterface {
    *   The config import event.
    */
   public function onConfigImporterValidateSiteUUID(ConfigImporterEvent $event) {
+    if (!$event->getConfigImporter()->getStorageComparer()->getSourceStorage()->exists('system.site')) {
+      $event->getConfigImporter()->logError($this->t('This import does not contain system.site configuration, so has been rejected.'));
+    }
     if (!$event->getConfigImporter()->getStorageComparer()->validateSiteUuid()) {
       $event->getConfigImporter()->logError($this->t('Site UUID in source storage does not match the target storage.'));
     }