Merge pull request #74 from UN-OCHA/develop

[OPS-8250] core security update
UN-OCHA · Apr 26, 2022 · 9e9a667 · 9e9a667
2 parents 6fb6fe7 + 20bca4b
commit 9e9a667
Show file tree

Hide file tree

Showing 149 changed files with 3,830 additions and 3,814 deletions.
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
         "drupal/r4032login": "^2.1",
         "drupal/redirect": "^1.6",
         "drupal/seckit": "^2.0",
-        "drupal/social_auth_hid": "^3.0",
+        "drupal/social_auth_hid": "^3.1",
         "drupal/user_expire": "^1.0",
         "drush/drush": "^10.2.2",
         "oomphinc/composer-installers-extender": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/block.block.breadcrumbs.yml b/config/block.block.breadcrumbs.yml
@@ -15,6 +15,6 @@ plugin: system_breadcrumb_block
 settings:
   id: system_breadcrumb_block
   label: Breadcrumbs
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.breadcrumbs_2.yml b/config/block.block.breadcrumbs_2.yml
@@ -15,6 +15,6 @@ plugin: system_breadcrumb_block
 settings:
   id: system_breadcrumb_block
   label: Breadcrumbs
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_admin.yml b/config/block.block.common_design_admin.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:admin'
 settings:
   id: 'system_menu_block:admin'
   label: Administration
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.common_design_admin_subtheme_local_actions.yml b/config/block.block.common_design_admin_subtheme_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_admin_subtheme_local_tasks.yml b/config/block.block.common_design_admin_subtheme_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.common_design_admin_subtheme_mainnavigation.yml b/config/block.block.common_design_admin_subtheme_mainnavigation.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:main'
 settings:
   id: 'system_menu_block:main'
   label: 'Main navigation'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.common_design_admin_subtheme_messages.yml b/config/block.block.common_design_admin_subtheme_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_admin_subtheme_page_title.yml b/config/block.block.common_design_admin_subtheme_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_admin_subtheme_sitebranding.yml b/config/block.block.common_design_admin_subtheme_sitebranding.yml
@@ -15,8 +15,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

diff --git a/config/block.block.common_design_admin_subtheme_useraccountmenu.yml b/config/block.block.common_design_admin_subtheme_useraccountmenu.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:account'
 settings:
   id: 'system_menu_block:account'
   label: 'User account menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.common_design_branding.yml b/config/block.block.common_design_branding.yml
@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

diff --git a/config/block.block.common_design_local_actions.yml b/config/block.block.common_design_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_local_tasks.yml b/config/block.block.common_design_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.common_design_messages.yml b/config/block.block.common_design_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_page_title.yml b/config/block.block.common_design_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_local_actions.yml b/config/block.block.common_design_subtheme_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_local_tasks.yml b/config/block.block.common_design_subtheme_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_messages.yml b/config/block.block.common_design_subtheme_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_page_title.yml b/config/block.block.common_design_subtheme_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_tools.yml b/config/block.block.common_design_tools.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools'
 settings:
   id: 'system_menu_block:tools'
   label: Tools
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.footer.yml b/config/block.block.footer.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:footer'
 settings:
   id: 'system_menu_block:footer'
   label: Footer
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.mainnavigation.yml b/config/block.block.mainnavigation.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:main'
 settings:
   id: 'system_menu_block:main'
   label: 'Main navigation'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.seven_admin.yml b/config/block.block.seven_admin.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:admin'
 settings:
   id: 'system_menu_block:admin'
   label: Administration
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.seven_branding.yml b/config/block.block.seven_branding.yml
@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

diff --git a/config/block.block.seven_local_actions.yml b/config/block.block.seven_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.seven_local_tasks.yml b/config/block.block.seven_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.seven_messages.yml b/config/block.block.seven_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.seven_page_title.yml b/config/block.block.seven_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.seven_tools.yml b/config/block.block.seven_tools.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools'
 settings:
   id: 'system_menu_block:tools'
   label: Tools
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/block.block.sitebranding.yml b/config/block.block.sitebranding.yml
@@ -15,8 +15,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

diff --git a/config/block.block.useraccountmenu.yml b/config/block.block.useraccountmenu.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:account'
 settings:
   id: 'system_menu_block:account'
   label: 'User account menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

diff --git a/config/core.entity_form_display.media.document.default.yml b/config/core.entity_form_display.media.document.default.yml
@@ -20,12 +20,12 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_media_file:
+    type: file_generic
     weight: 0
+    region: content
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
-    type: file_generic
-    region: content
   name:
     type: string_textfield
     weight: -5
@@ -42,19 +42,19 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 100
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
-      match_limit: 10
-    region: content
     third_party_settings: {  }
 hidden: {  }
diff --git a/config/core.entity_form_display.media.document.media_library.yml b/config/core.entity_form_display.media.document.media_library.yml
@@ -13,12 +13,12 @@ mode: media_library
 content:
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   field_media_file: true

diff --git a/config/core.entity_form_display.media.image.default.yml b/config/core.entity_form_display.media.image.default.yml
@@ -14,13 +14,13 @@ bundle: image
 mode: default
 content:
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
     weight: 0

diff --git a/config/core.entity_form_display.media.image.media_library.yml b/config/core.entity_form_display.media.image.media_library.yml
@@ -15,21 +15,21 @@ bundle: image
 mode: media_library
 content:
   field_media_image:
+    type: image_image
     weight: 5
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   path: true