Backdrop 1.25.1 (#47)

docksal · Jun 29, 2023 · 7837af5 · 7837af5
1 parent 3fe8dfa
commit 7837af5
Show file tree

Hide file tree

Showing 213 changed files with 734 additions and 621 deletions.
diff --git a/docroot/core/includes/bootstrap.inc b/docroot/core/includes/bootstrap.inc
@@ -7,7 +7,7 @@
 /**
  * The current system version.
  */
-define('BACKDROP_VERSION', '1.25.0');
+define('BACKDROP_VERSION', '1.25.1');
 
 /**
  * Core API compatibility.

diff --git a/docroot/core/includes/form.inc b/docroot/core/includes/form.inc
@@ -2887,7 +2887,7 @@ function form_select_options($element, $choices = NULL) {
     else {
       $key = (string) $key;
       $option_attributes = array();
-      $option_attributes['value'] = check_plain($key);
+      $option_attributes['value'] = $key;
       if ($value_valid && (!$value_is_array && (string) $element['#value'] === $key || ($value_is_array && in_array($key, $element['#value'])))) {
         $option_attributes['selected'] = 'selected';
       }
@@ -3313,6 +3313,29 @@ function html_date_validate($element, &$form_state) {
   }
 }
 
+/**
+ * Element value callback for html_date and html_time elements.
+ */
+function html_date_or_time_value_callback($element, $input = FALSE, &$form_state = array()) {
+  $return = '';
+  if ($input !== FALSE) {
+    $return = $input;
+  }
+  elseif (!empty($element['#default_value'])) {
+    if (is_array($element['#default_value'])) {
+      // Since #default_value for elements with #access set to FALSE or with
+      // #disabled set to TRUE is often an array, extract the actual value and
+      // return it.
+      $type = str_replace('html_', '', $element['#type']);
+      $return = $element['#default_value'][$type];
+    }
+    else {
+      $return = $element['#default_value'];
+    }
+  }
+  return $return;
+}
+
 /**
  * Validate a time string.
  */

diff --git a/docroot/core/layouts/boxton/boxton.info b/docroot/core/layouts/boxton/boxton.info
@@ -25,7 +25,7 @@ preview = boxton.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/geary/geary.info b/docroot/core/layouts/geary/geary.info
@@ -27,7 +27,7 @@ preview = geary.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/harris/harris.info b/docroot/core/layouts/harris/harris.info
@@ -27,7 +27,7 @@ preview = harris.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/legacy/one_column/one_column.info b/docroot/core/layouts/legacy/one_column/one_column.info
@@ -18,7 +18,7 @@ regions[footer] = Footer
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/legacy/three_three_four_column/three_three_four_column.info b/docroot/core/layouts/legacy/three_three_four_column/three_three_four_column.info
@@ -26,7 +26,7 @@ regions[footer] = Footer bottom
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/legacy/two_column/two_column.info b/docroot/core/layouts/legacy/two_column/two_column.info
@@ -15,7 +15,7 @@ regions[footer] = Footer
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/legacy/two_column_flipped/two_column_flipped.info b/docroot/core/layouts/legacy/two_column_flipped/two_column_flipped.info
@@ -15,7 +15,7 @@ regions[footer] = Footer
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/moscone/moscone.info b/docroot/core/layouts/moscone/moscone.info
@@ -26,7 +26,7 @@ preview = moscone.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/moscone_flipped/moscone_flipped.info b/docroot/core/layouts/moscone_flipped/moscone_flipped.info
@@ -26,7 +26,7 @@ preview = moscone-flipped.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/rolph/rolph.info b/docroot/core/layouts/rolph/rolph.info
@@ -28,7 +28,7 @@ preview = rolph.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/simmons/simmons.info b/docroot/core/layouts/simmons/simmons.info
@@ -34,7 +34,7 @@ file = simmons.php
 ; Default stylesheets for this layout
 ; stylesheets[all][] = simmons.css
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/sutro/sutro.info b/docroot/core/layouts/sutro/sutro.info
@@ -27,7 +27,7 @@ preview = sutro.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/taylor/taylor.info b/docroot/core/layouts/taylor/taylor.info
@@ -27,7 +27,7 @@ preview = taylor.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/layouts/taylor_flipped/taylor_flipped.info b/docroot/core/layouts/taylor_flipped/taylor_flipped.info
@@ -27,7 +27,7 @@ preview = taylor-flipped.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/admin_bar/admin_bar.info b/docroot/core/modules/admin_bar/admin_bar.info
@@ -11,7 +11,7 @@ backdrop = 1.x
 configure = admin/config/administration/admin-bar
 
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/admin_bar/admin_bar.module b/docroot/core/modules/admin_bar/admin_bar.module
@@ -260,8 +260,6 @@ function admin_bar_preprocess_page(&$variables) {
   if (path_is_admin($current_path)) {
     $settings['current_path_is_admin'] = TRUE;
   }
-  $alias = backdrop_get_path_alias($current_path, $language->langcode);
-  $settings['current_path'] = $alias;
 
   $components = $config->get('components');
   if (in_array('admin_bar.back_to_site_link', $components)) {

diff --git a/docroot/core/modules/admin_bar/js/admin_bar.js b/docroot/core/modules/admin_bar/js/admin_bar.js
@@ -524,7 +524,7 @@ Backdrop.adminBar.behaviors.escapeAdmin = function (context, settings) {
   ) {
     sessionStorage.setItem(
       "escapeAdminPath",
-      settings.admin_bar.current_path
+      window.location
     );
   }
 
@@ -538,7 +538,7 @@ Backdrop.adminBar.behaviors.escapeAdmin = function (context, settings) {
     escapeAdminPath !== null
   ) {
     $toolbarEscape.addClass("escape");
-    $toolbarEscape.attr("href", settings.basePath + escapeAdminPath);
+    $toolbarEscape.attr("href", escapeAdminPath);
     $toolbarEscape.text(Backdrop.t("Back to site"));
   }
 };

diff --git a/docroot/core/modules/admin_bar/tests/admin_bar.tests.info b/docroot/core/modules/admin_bar/tests/admin_bar.tests.info
@@ -22,7 +22,7 @@ description = Tests customized menu links.
 group = Administration bar
 file = admin_bar.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/block/block.info b/docroot/core/modules/block/block.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 
 configure = admin/structure/block
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/block/tests/block.tests.info b/docroot/core/modules/block/tests/block.tests.info
@@ -10,7 +10,7 @@ description = Add, translate and delete custom block.
 group = Block
 file = block.translation.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/block/tests/block_test/block_test.info b/docroot/core/modules/block/tests/block_test/block_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/book/book.info b/docroot/core/modules/book/book.info
@@ -12,7 +12,7 @@ dependencies[] = node
 
 configure = admin/content/book/settings
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/book/tests/book.tests.info b/docroot/core/modules/book/tests/book.tests.info
@@ -4,7 +4,7 @@ description = Create a book, add pages, and test book interface.
 group = Book
 file = book.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/ckeditor/ckeditor.info b/docroot/core/modules/ckeditor/ckeditor.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 
 configure = admin/config/content/formats
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/ckeditor/tests/ckeditor.tests.info b/docroot/core/modules/ckeditor/tests/ckeditor.tests.info
@@ -10,7 +10,7 @@ description = Check the functionality of CKEditor with right-to-left languages.
 group = CKEditor
 file = ckeditor_rtl.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/color/color.info b/docroot/core/modules/color/color.info
@@ -6,7 +6,7 @@ tags[] = Theme Enhancements
 version = BACKDROP_VERSION
 backdrop = 1.x
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/color/tests/color.tests.info b/docroot/core/modules/color/tests/color.tests.info
@@ -4,7 +4,7 @@ description = Modify the Bartik theme colors and make sure the changes are refle
 group = Color
 file = color.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/comment/comment.info b/docroot/core/modules/comment/comment.info
@@ -13,7 +13,7 @@ configure = admin/content/comment
 
 stylesheets[all][] = css/comment.css
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/comment/tests/comment.tests.info b/docroot/core/modules/comment/tests/comment.tests.info
@@ -106,7 +106,7 @@ description = 'Test the behavior of comments when the comment author is deleted.
 group = Comment
 file = comment.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/config/config.info b/docroot/core/modules/config/config.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 configure = admin/config/development/configuration
 
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096
diff --git a/docroot/core/modules/config/tests/config.tests.info b/docroot/core/modules/config/tests/config.tests.info
@@ -22,7 +22,7 @@ description = Tests that hook_config_create() is run during configuration sync.
 group = Configuration
 file = config.test
 
-; Added by Backdrop CMS packaging script on 2023-05-15
+; Added by Backdrop CMS packaging script on 2023-06-07
 project = backdrop
-version = 1.25.0
-timestamp = 1684204044
+version = 1.25.1
+timestamp = 1686169096