Merge branch 'develop'

MukurtuCMS · Feb 21, 2022 · 0bd655b · 0bd655b
2 parents b501698 + 2c5c412
commit 0bd655b
Show file tree

Hide file tree

Showing 145 changed files with 509 additions and 408 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Drupal 7.88, 2022-02-15
+-----------------------
+- Fixed security issues:
+   - SA-CORE-2022-003
+
 Drupal 7.87, 2022-01-19
 -----------------------
 - Fix regression caused by jQuery UI position() backport

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Mukurtu CMS 3.0.1
+# Mukurtu CMS 3.0.2
 ### [Release Notes](VERSION.md)
 
 ## Contents

diff --git a/VERSION.md b/VERSION.md
@@ -1,3 +1,10 @@
+## Mukurtu 3.0.2
+- Updated to Drupal 7.88
+- Updated Colorbox
+
+#### Manual Upgrade Steps
+This version does not require any database updates.
+
 ## Mukurtu 3.0.1
 - Updated to Drupal 7.87
 - Change default permissions for 'delete all items' option in feeds

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.87');
+define('VERSION', '7.88');
 
 /**
  * Core API compatibility.

diff --git a/includes/bootstrap.inc.orig b/includes/bootstrap.inc.orig
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.87');
+define('VERSION', '7.88');
 
 /**
  * Core API compatibility.

diff --git a/includes/form.inc b/includes/form.inc
@@ -2087,7 +2087,7 @@ function _form_builder_handle_input_element($form_id, &$element, &$form_state) {
   // #access=FALSE on an element usually allow access for some users, so forms
   // submitted with drupal_form_submit() may bypass access restriction and be
   // treated as high-privilege users instead.
-  $process_input = empty($element['#disabled']) && (($form_state['programmed'] && $form_state['programmed_bypass_access_check']) || ($form_state['process_input'] && (!isset($element['#access']) || $element['#access'])));
+  $process_input = empty($element['#disabled']) && ($element['#type'] !== 'value') && (($form_state['programmed'] && $form_state['programmed_bypass_access_check']) || ($form_state['process_input'] && (!isset($element['#access']) || $element['#access'])));
 
   // Set the element's #value property.
   if (!isset($element['#value']) && !array_key_exists('#value', $element)) {

diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
@@ -7,7 +7,7 @@ files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/block/block.info b/modules/block/block.info
@@ -6,7 +6,7 @@ core = 7.x
 files[] = block.test
 configure = admin/structure/block
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info
@@ -13,7 +13,7 @@ regions[footer] = Footer
 regions[highlighted] = Highlighted
 regions[help] = Help
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = blog.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/book/book.info b/modules/book/book.info
@@ -7,7 +7,7 @@ files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/color/color.info b/modules/color/color.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = color.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
@@ -9,7 +9,7 @@ files[] = comment.test
 configure = admin/content/comment
 stylesheets[all][] = comment.css
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
@@ -6,7 +6,7 @@ core = 7.x
 files[] = contact.test
 configure = admin/structure/contact
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = contextual.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
@@ -7,7 +7,7 @@ files[] = dashboard.test
 dependencies[] = block
 configure = admin/dashboard/customize
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = dblog.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/field.info b/modules/field/field.info
@@ -11,7 +11,7 @@ dependencies[] = field_sql_storage
 required = TRUE
 stylesheets[all][] = theme/field.css
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -7,7 +7,7 @@ dependencies[] = field
 files[] = field_sql_storage.test
 required = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
@@ -7,7 +7,7 @@ dependencies[] = field
 dependencies[] = options
 files[] = tests/list.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
@@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
@@ -6,7 +6,7 @@ core = 7.x
 dependencies[] = field
 files[] = number.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
@@ -6,7 +6,7 @@ core = 7.x
 dependencies[] = field
 files[] = options.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
@@ -7,7 +7,7 @@ dependencies[] = field
 files[] = text.test
 required = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
@@ -6,7 +6,7 @@ files[] = field_test.entity.inc
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
@@ -6,7 +6,7 @@ core = 7.x
 dependencies[] = field
 files[] = field_ui.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/file/file.info b/modules/file/file.info
@@ -6,7 +6,7 @@ core = 7.x
 dependencies[] = field
 files[] = tests/file.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
@@ -7,7 +7,7 @@ files[] = filter.test
 required = TRUE
 configure = admin/config/content/formats
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
@@ -9,7 +9,7 @@ files[] = forum.test
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/help/help.info b/modules/help/help.info
@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = help.test
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/image/image.info b/modules/image/image.info
@@ -7,7 +7,7 @@ dependencies[] = file
 files[] = image.test
 configure = admin/config/media/image-styles
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info
@@ -6,7 +6,7 @@ core = 7.x
 files[] = image_module_test.module
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
@@ -6,7 +6,7 @@ core = 7.x
 files[] = locale.test
 configure = admin/config/regional/language
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
@@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2022-01-19
-version = "7.87"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.88"
 project = "drupal"
-datestamp = "1642633901"
+datestamp = "1645030312"