diff --git a/docroot/core/includes/bootstrap.inc b/docroot/core/includes/bootstrap.inc index 5ac2546b..736fb764 100644 --- a/docroot/core/includes/bootstrap.inc +++ b/docroot/core/includes/bootstrap.inc @@ -7,7 +7,7 @@ /** * The current system version. */ -define('BACKDROP_VERSION', '1.26.0'); +define('BACKDROP_VERSION', '1.26.1'); /** * Core API compatibility. diff --git a/docroot/core/includes/common.inc b/docroot/core/includes/common.inc index 678278fc..36a3ff44 100644 --- a/docroot/core/includes/common.inc +++ b/docroot/core/includes/common.inc @@ -2913,7 +2913,16 @@ function l($text, $path, array $options = array()) { $attributes = backdrop_attributes($options['attributes']); unset($options['attributes']); - $url = check_plain(url($path, $options)); + $url = url($path, $options); + $skip_js_paths = array( + 'javascript:void()', + 'javascript:void();', + 'javascript:void(0)', + 'javascript:void(0);', + ); + if (!(is_null($path) || in_array(strtolower($path), $skip_js_paths))) { + $url = check_url($url); + } // Sanitize the link text if necessary. if (!$options['html']) { diff --git a/docroot/core/includes/filetransfer/filetransfer.inc b/docroot/core/includes/filetransfer/filetransfer.inc index 56337b50..383a2f10 100644 --- a/docroot/core/includes/filetransfer/filetransfer.inc +++ b/docroot/core/includes/filetransfer/filetransfer.inc @@ -11,31 +11,76 @@ * root. */ abstract class FileTransfer { + + /** + * The username for this file transfer. + * + * @var string + */ protected $username; + + /** + * The password for this file transfer. + * + * @var string + */ protected $password; + + /** + * The hostname for this file transfer. + * + * @var string + */ protected $hostname = 'localhost'; + + /** + * The port for this file transfer. + * + * @var int + */ protected $port; /** + * Full path to directory where file-transfer is restricted to. + * * @var string */ protected $jail; /** - * @var string + * Path to connection chroot. + * + * @var string|false|null */ - protected $chroot; + private $chrootPath; /** - * The constructor for the UpdateConnection class. This method is also called - * from the classes that extend this class and override this method. + * The instantiated connection object. + * + * @var object|false|null + */ + private $connectionHandle; + + /** + * The constructor for the FileTransfer class. + * + * This method is also called from the classes that extend this class and + * override this method. + * + * @param string $jail + * The full path where all file operations performed by this object will + * be restricted to. This prevents the FileTransfer classes from being + * able to touch other parts of the filesystem. */ function __construct($jail) { $this->jail = $jail; } /** + * Defines a factory method for this class. + * * Classes that extend this class must override the factory() static method. + * They should return a new instance of the appropriate FileTransfer subclass. * * @param string $jail * The full path where all file operations performed by this object will @@ -46,7 +91,7 @@ abstract class FileTransfer { * getSettingsForm() method uses any nested settings, the same structure * will be assumed here. * - * @return FileTransfer + * @return object * New instance of the appropriate FileTransfer subclass. * * @throws FileTransferException @@ -61,19 +106,72 @@ abstract class FileTransfer { * If the connection isn't set to anything, this will call the connect() method * and set it to and return the result; afterwards, the connection will be * returned directly without using this method. + * + * @param string $name + * The name of the variable to return. + * + * @return string|bool + * The variable specified in $name. */ function __get($name) { if ($name == 'connection') { $this->connect(); - return $this->connection; + return $this->connectionHandle; } if ($name == 'chroot') { $this->setChroot(); - return $this->chroot; + return $this->chrootPath; } + } + + /** + * Implementation of the magic __set() method. + * + * @param string $name + * The name of the variable to set. + * + * @param string|object|false|null $value + * The value to be assigned to the variable. + */ + public function __set($name, $value) { + if ($name == 'connection') { + $this->connectionHandle = $value; + } + elseif ($name == 'chroot') { + $this->chrootPath = $value; + } + } + + /** + * Implementation of the magic __isset() method. + * + * @param string $name + * The name of the variable to check. + */ + public function __isset($name) { + if ($name == 'connection') { + return isset($this->connectionHandle); + } + if ($name == 'chroot') { + return isset($this->chrootPath); + } + return FALSE; + } - return NULL; + /** + * Implementation of the magic __unset() method. + * + * @param string $name + * The name of the variable to unset. + */ + public function __unset($name) { + if ($name == 'connection') { + unset($this->connectionHandle); + } + elseif ($name == 'chroot') { + unset($this->chrootPath); + } } /** @@ -89,7 +187,7 @@ abstract class FileTransfer { * @param $destination * The destination path. */ - public final function copyDirectory($source, $destination) { + final public function copyDirectory($source, $destination) { $source = $this->sanitizePath($source); $destination = $this->fixRemotePath($destination); $this->checkPath($destination); @@ -97,15 +195,20 @@ abstract class FileTransfer { } /** - * @see http://php.net/chmod + * Changes the permissions of the specified $path (file or directory). * * @param string $path + * The file / directory to change the permissions of. * @param int $mode + * The new file permission mode to be passed to chmod(). * @param bool $recursive + * Pass TRUE to recursively chmod the entire directory specified in $path. * * @throws FileTransferException + * + * @see http://php.net/chmod */ - public final function chmod($path, $mode, $recursive = FALSE) { + final public function chmod($path, $mode, $recursive = FALSE) { if (!in_array('FileTransferChmodInterface', class_implements(get_class($this)))) { throw new FileTransferException('Unable to change file permissions'); } @@ -173,7 +276,6 @@ abstract class FileTransfer { * A path to check against the jail. * * @throws FileTransferException - * */ protected final function checkPath($path) { $full_jail = $this->chroot . $this->jail; @@ -186,21 +288,25 @@ abstract class FileTransfer { /** * Returns a modified path suitable for passing to the server. + * * If a path is a windows path, makes it POSIX compliant by removing the drive letter. * If $this->chroot has a value, it is stripped from the path to allow for * chroot'd filetransfer systems. * * @param $path + * The path to modify. * @param $strip_chroot + * Whether to remove the path in $this->chroot. * * @return string + * The modified path. */ protected final function fixRemotePath($path, $strip_chroot = TRUE) { $path = $this->sanitizePath($path); $path = preg_replace('|^([a-z]{1}):|i', '', $path); // Strip out windows driveletter if its there. if ($strip_chroot) { - if ($this->chroot && strpos($path, $this->chroot) === 0) { - $path = ($path == $this->chroot) ? '' : substr($path, strlen($this->chroot)); + if ($this->chrootPath && strpos($path, $this->chrootPath) === 0) { + $path = ($path == $this->chrootPath) ? '' : substr($path, strlen($this->chrootPath)); } } return $path; @@ -348,6 +454,9 @@ abstract class FileTransfer { * * Implementing classes can either extend this form with fields collecting the * specific information they need, or override it entirely. + * + * @return array + * An array that contains a Form API definition. */ public function getSettingsForm() { $form['username'] = array( diff --git a/docroot/core/includes/form.inc b/docroot/core/includes/form.inc index 725e65e2..0ebcac40 100644 --- a/docroot/core/includes/form.inc +++ b/docroot/core/includes/form.inc @@ -4964,7 +4964,8 @@ function theme_form_required_marker($variables) { * @param $variables * An associative array containing: * - element: An associative array containing the properties of the element. - * Properties used: #required, #title, #id, #value, #description. + * Properties used: #required, #title, #id, #value, #description, + * #label_for. * * @ingroup themeable */ @@ -4993,7 +4994,14 @@ function theme_form_element_label($variables) { $attributes['class'] = 'element-invisible'; } - if (!empty($element['#id'])) { + // Use the element's ID as the default value of the "for" attribute (to + // associate the label with this form element), but allow this to be + // overridden in order to associate the label with a different form element + // instead. + if (!empty($element['#label_for'])) { + $attributes['for'] = $element['#label_for']; + } + elseif (!empty($element['#id'])) { $attributes['for'] = $element['#id']; } diff --git a/docroot/core/includes/theme.inc b/docroot/core/includes/theme.inc index 7432aa56..04d62d64 100644 --- a/docroot/core/includes/theme.inc +++ b/docroot/core/includes/theme.inc @@ -2049,7 +2049,7 @@ function theme_breadcrumb($variables) { $output = ''; if (!empty($breadcrumb)) { $output .= ''; } return $output; diff --git a/docroot/core/layouts/boxton/boxton.info b/docroot/core/layouts/boxton/boxton.info index eee454cf..c3ad0c11 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/geary/geary.info b/docroot/core/layouts/geary/geary.info index b496d639..e55c4306 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/harris/harris.info b/docroot/core/layouts/harris/harris.info index 80707276..de529b10 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/legacy/one_column/one_column.info b/docroot/core/layouts/legacy/one_column/one_column.info index d7b208ac..939e4af8 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 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 index 47acc53d..ad471c64 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/legacy/two_column/two_column.info b/docroot/core/layouts/legacy/two_column/two_column.info index 112511c5..ed536aed 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 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 index 7b512c4b..99b5775f 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/moscone/moscone.info b/docroot/core/layouts/moscone/moscone.info index 21c36ba5..e000170c 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/moscone_flipped/moscone_flipped.info b/docroot/core/layouts/moscone_flipped/moscone_flipped.info index 2018d874..da819406 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/rolph/rolph.info b/docroot/core/layouts/rolph/rolph.info index d27ae27a..cfa39aee 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/simmons/simmons.info b/docroot/core/layouts/simmons/simmons.info index 0a30ac6b..99b4f3d3 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/sutro/sutro.info b/docroot/core/layouts/sutro/sutro.info index 62056054..c4ae252d 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/taylor/taylor.info b/docroot/core/layouts/taylor/taylor.info index 05680502..da71ae24 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/layouts/taylor_flipped/taylor_flipped.info b/docroot/core/layouts/taylor_flipped/taylor_flipped.info index f441342b..9a6bf1d8 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/admin_bar/admin_bar.info b/docroot/core/modules/admin_bar/admin_bar.info index b4344321..78bc8221 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/admin_bar/tests/admin_bar.tests.info b/docroot/core/modules/admin_bar/tests/admin_bar.tests.info index a4f42056..b245f2b1 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/block/block.info b/docroot/core/modules/block/block.info index 1b706204..83f071c2 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/block/tests/block.tests.info b/docroot/core/modules/block/tests/block.tests.info index 9223087f..a8950f92 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/block/tests/block_test/block_test.info b/docroot/core/modules/block/tests/block_test/block_test.info index a869215d..205c2de1 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/book/book.info b/docroot/core/modules/book/book.info index 45d69692..0f280e08 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/book/tests/book.tests.info b/docroot/core/modules/book/tests/book.tests.info index c33de2d8..43a0b9de 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/ckeditor/ckeditor.info b/docroot/core/modules/ckeditor/ckeditor.info index db8a46a8..c8be6903 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/ckeditor/tests/ckeditor.tests.info b/docroot/core/modules/ckeditor/tests/ckeditor.tests.info index eefc8283..630f5e2b 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/color/color.info b/docroot/core/modules/color/color.info index c356d21d..5e9eeab1 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/color/tests/color.tests.info b/docroot/core/modules/color/tests/color.tests.info index 487db24d..78b46d54 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/comment/comment.info b/docroot/core/modules/comment/comment.info index 74747f3a..37e77657 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/comment/tests/comment.tests.info b/docroot/core/modules/comment/tests/comment.tests.info index 22b23e45..08e97ab3 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/config/config.info b/docroot/core/modules/config/config.info index 3a3c88f5..7fda7840 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/config/tests/config.tests.info b/docroot/core/modules/config/tests/config.tests.info index 638845f1..2e7ce5c5 100644 --- 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-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/config/tests/config_test/config_test.info b/docroot/core/modules/config/tests/config_test/config_test.info index 68e9b5ec..765cf6fd 100644 --- a/docroot/core/modules/config/tests/config_test/config_test.info +++ b/docroot/core/modules/config/tests/config_test/config_test.info @@ -6,7 +6,7 @@ backdrop = 1.x package = Testing hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info b/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info index ef53090d..603ced29 100644 --- a/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info +++ b/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info @@ -6,7 +6,7 @@ backdrop = 1.x package = Testing hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/contact/contact.admin.inc b/docroot/core/modules/contact/contact.admin.inc index 85dbd82f..3b6882f8 100644 --- a/docroot/core/modules/contact/contact.admin.inc +++ b/docroot/core/modules/contact/contact.admin.inc @@ -141,9 +141,8 @@ function contact_form_permissions() { '#description' => theme('user_permission_description', array('permission_item' => $perm_item)), ); foreach ($roles as $role_name => $role) { - // Builds arrays for checked boxes for each role. Always select the Admin - // role on new forms. - if (in_array($perm, $role->permissions) || ($role->name == $admin_role)) { + // Builds arrays for checked boxes for each role. + if (in_array($perm, $role->permissions)) { $status[$role_name][] = $perm; } } diff --git a/docroot/core/modules/contact/contact.info b/docroot/core/modules/contact/contact.info index ee8dbddb..984afe23 100644 --- a/docroot/core/modules/contact/contact.info +++ b/docroot/core/modules/contact/contact.info @@ -9,7 +9,7 @@ backdrop = 1.x configure = admin/structure/contact -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/contact/tests/contact.tests.info b/docroot/core/modules/contact/tests/contact.tests.info index 504ef11c..3344e1b5 100644 --- a/docroot/core/modules/contact/tests/contact.tests.info +++ b/docroot/core/modules/contact/tests/contact.tests.info @@ -10,7 +10,7 @@ description = Tests personal contact form functionality. group = Contact file = contact.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/contextual/contextual.info b/docroot/core/modules/contextual/contextual.info index 79dacbc8..052c7108 100644 --- a/docroot/core/modules/contextual/contextual.info +++ b/docroot/core/modules/contextual/contextual.info @@ -7,7 +7,7 @@ tags[] = Site Navigation version = BACKDROP_VERSION backdrop = 1.x -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/contextual/js/contextual.js b/docroot/core/modules/contextual/js/contextual.js index 5d01ff7e..677fbad2 100644 --- a/docroot/core/modules/contextual/js/contextual.js +++ b/docroot/core/modules/contextual/js/contextual.js @@ -32,7 +32,8 @@ Backdrop.behaviors.contextualLinks = { $region.removeClass('contextual-links-region-active'); }); - // Hide the contextual links when user clicks a link or rolls out of the .contextual-links-region. + // Hide the contextual links when user clicks a link or rolls out of the + // .contextual-links-region. $region.on('mouseleave click', Backdrop.contextualLinks.mouseleave); $region.on('mouseenter', function() { $trigger.addClass('contextual-links-trigger-active'); @@ -43,10 +44,94 @@ Backdrop.behaviors.contextualLinks = { // Prepend the trigger. $wrapper.prepend($trigger); - - // Prevent child contextual links overlapping their parent ones. - $wrapper.siblings().find('.contextual-links-wrapper').eq(0).css('margin-top', '20px'); }); + + /** + * Adjusts trigger positions in contextual links to avoid overlaps. + */ + function adjustContextualLinks() { + // Get all wrappers anywhere on the page and some info about each. + var allWrappers = []; + $('.contextual-links-wrapper', context).each(function() { + allWrappers.push({ + '$wrapper': $(this), + 'regionOffsetBottom': $(this).parent().offset().top + $(this).parent().height(), + 'hShift': 0, + 'vShift': 0 + }); + }); + + // Reset margins on all wrappers. + allWrappers.forEach(function(info) { + info.$wrapper.css('margin', '0'); + }); + + // Recalculate margins to avoid collisions. + var dir = $('html').attr('dir'); + const hSize = 28; // width of trigger wrapper + const vSize = 19; // height of trigger wrapper + var n = allWrappers.length; + for (let i = 0; i < n; i++) { + var follower = allWrappers[i]; + // Compare follower against all of its predecessors in the list (any of + // which may have already been adjusted). + for (let j = 0; j < i; j++) { + var leader = allWrappers[j]; + // Adjust the position of follower if necessary to avoid collision + // with leader. + var leaderOffset = leader.$wrapper.offset(); + var followerOffset = follower.$wrapper.offset(); + // Check vertical overlap. + if (!(followerOffset.top >= leaderOffset.top && followerOffset.top < leaderOffset.top + vSize)) { + continue; + } + if (dir == 'ltr') { + // Check horizontal overlap. + if (followerOffset.left >= leaderOffset.left - hSize && followerOffset.left < leaderOffset.left + hSize) { + // We have a collision; shift the follower down if there's room, + // otherwise left. + if (followerOffset.top + 2 * vSize <= follower.regionOffsetBottom) { + // Shift down + follower.vShift += vSize; + follower.$wrapper.css('margin-top', follower.vShift); + } + else { + // Shift left and start a new column. + follower.vShift = 0; + follower.hShift += hSize; + follower.$wrapper.css('margin-top', follower.vShift); + follower.$wrapper.css('margin-right', follower.hShift); + } + } + } + else { // rtl + // Check horizontal overlap. + if (followerOffset.left > leaderOffset.left - hSize && followerOffset.left <= leaderOffset.left + hSize) { + // We have a collision; shift the follower down if there's room, + // otherwise right. + if (followerOffset.top + 2 * vSize <= follower.regionOffsetBottom) { + // Shift down + follower.vShift += vSize; + follower.$wrapper.css('margin-top', follower.vShift); + } + else { + // Shift right and start a new column. + follower.vShift = 0; + follower.hShift += hSize; + follower.$wrapper.css('margin-top', follower.vShift); + follower.$wrapper.css('margin-left', follower.hShift); + } + } + } + } + } + } + $(document).ready(adjustContextualLinks); + + // Usually Backdrop.optimizedResize() would be used for a window resize + // event, but this potentially expensive operation should be limited to + // firing infrequently, so Backdrop.debounce() is used here instead. + $(window).on('resize', Backdrop.debounce(adjustContextualLinks, 500)); } }; diff --git a/docroot/core/modules/contextual/tests/contextual.tests.info b/docroot/core/modules/contextual/tests/contextual.tests.info index bde436d2..e5001597 100644 --- a/docroot/core/modules/contextual/tests/contextual.tests.info +++ b/docroot/core/modules/contextual/tests/contextual.tests.info @@ -4,7 +4,7 @@ description = Tests if contextual links are showing on the home page depending o group = Contextual file = contextual.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/dashboard/dashboard.info b/docroot/core/modules/dashboard/dashboard.info index fdbb8c37..f6062645 100644 --- a/docroot/core/modules/dashboard/dashboard.info +++ b/docroot/core/modules/dashboard/dashboard.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x configure = admin/dashboard/settings -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/dashboard/tests/dashboard.tests.info b/docroot/core/modules/dashboard/tests/dashboard.tests.info index f5aaee2e..b6e1c074 100644 --- a/docroot/core/modules/dashboard/tests/dashboard.tests.info +++ b/docroot/core/modules/dashboard/tests/dashboard.tests.info @@ -4,7 +4,7 @@ description = Tests the Dashboard functions correctly. group = Dashboard file = dashboard.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/date/date.info b/docroot/core/modules/date/date.info index b751589c..847034eb 100644 --- a/docroot/core/modules/date/date.info +++ b/docroot/core/modules/date/date.info @@ -9,7 +9,7 @@ backdrop = 1.x stylesheets[all][] = css/date.css -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/date/tests/date.tests.info b/docroot/core/modules/date/tests/date.tests.info index 8984dcc3..3156d553 100644 --- a/docroot/core/modules/date/tests/date.tests.info +++ b/docroot/core/modules/date/tests/date.tests.info @@ -46,7 +46,7 @@ description = Test date theme functions. group = Date file = date_themes.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/dblog/dblog.info b/docroot/core/modules/dblog/dblog.info index a59e5f41..d9fc3a93 100644 --- a/docroot/core/modules/dblog/dblog.info +++ b/docroot/core/modules/dblog/dblog.info @@ -6,7 +6,7 @@ tags[] = Logging version = BACKDROP_VERSION backdrop = 1.x -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/dblog/dblog.module b/docroot/core/modules/dblog/dblog.module index bf92dc95..a64f1f6c 100644 --- a/docroot/core/modules/dblog/dblog.module +++ b/docroot/core/modules/dblog/dblog.module @@ -39,7 +39,8 @@ function dblog_menu() { 'file' => 'dblog.admin.inc', ); $items['admin/reports/event/%'] = array( - 'title' => 'Details', + 'title' => 'Log message #@id', + 'title arguments' => array('@id' => 3), 'page callback' => 'dblog_event', 'page arguments' => array(3), 'access arguments' => array('access site reports'), diff --git a/docroot/core/modules/dblog/tests/dblog.test b/docroot/core/modules/dblog/tests/dblog.test index e7efd9f0..00f8e227 100644 --- a/docroot/core/modules/dblog/tests/dblog.test +++ b/docroot/core/modules/dblog/tests/dblog.test @@ -189,7 +189,7 @@ class DBLogTestCase extends BackdropWebTestCase { $this->backdropGet('admin/reports/event/1'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Details'), 'DBLog event node was displayed'); + $this->assertText(t('Log message #'), 'DBLog event node was displayed'); } // Check the date format on the database log report page. diff --git a/docroot/core/modules/dblog/tests/dblog.tests.info b/docroot/core/modules/dblog/tests/dblog.tests.info index 05069025..c5d678e4 100644 --- a/docroot/core/modules/dblog/tests/dblog.tests.info +++ b/docroot/core/modules/dblog/tests/dblog.tests.info @@ -4,7 +4,7 @@ description = Generate events and verify dblog entries; verify user access to lo group = DBLog file = dblog.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/email/email.info b/docroot/core/modules/email/email.info index d01ef20e..edfa0d85 100644 --- a/docroot/core/modules/email/email.info +++ b/docroot/core/modules/email/email.info @@ -8,7 +8,7 @@ version = BACKDROP_VERSION backdrop = 1.x -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/email/tests/email.tests.info b/docroot/core/modules/email/tests/email.tests.info index a60936f9..46a1263b 100644 --- a/docroot/core/modules/email/tests/email.tests.info +++ b/docroot/core/modules/email/tests/email.tests.info @@ -4,7 +4,7 @@ description = Tests email field functionality. group = Field types file = email.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/entity.info b/docroot/core/modules/entity/entity.info index ba81202a..530c75bb 100644 --- a/docroot/core/modules/entity/entity.info +++ b/docroot/core/modules/entity/entity.info @@ -7,7 +7,7 @@ version = BACKDROP_VERSION backdrop = 1.x required = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity.tests.info b/docroot/core/modules/entity/tests/entity.tests.info index d2698686..f33be1d0 100644 --- a/docroot/core/modules/entity/tests/entity.tests.info +++ b/docroot/core/modules/entity/tests/entity.tests.info @@ -28,7 +28,7 @@ description = Tests the entity_load() function. group = Entity API file = entity_crud.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info b/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info index 8fc91237..415a8dcf 100644 --- a/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info +++ b/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info @@ -7,7 +7,7 @@ backdrop = 1.x dependencies[] = entity_cache_test_dependency hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info b/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info index 9603985a..6d105e49 100644 --- a/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info +++ b/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info b/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info index 75db62c8..09fd69f6 100644 --- a/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info +++ b/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info @@ -7,7 +7,7 @@ backdrop = 1.x dependencies[] = entity hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info b/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info index 1bcd0d09..2f0fc4ab 100644 --- a/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info +++ b/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info b/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info index b15d9fa1..39600e44 100644 --- a/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info +++ b/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entity/tests/entity_test/entity_test.info b/docroot/core/modules/entity/tests/entity_test/entity_test.info index 8554e4b0..cca280cf 100644 --- a/docroot/core/modules/entity/tests/entity_test/entity_test.info +++ b/docroot/core/modules/entity/tests/entity_test/entity_test.info @@ -7,7 +7,7 @@ backdrop = 1.x dependencies[] = entity hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entityreference/entityreference.info b/docroot/core/modules/entityreference/entityreference.info index 902ca773..b32baeb4 100644 --- a/docroot/core/modules/entityreference/entityreference.info +++ b/docroot/core/modules/entityreference/entityreference.info @@ -8,7 +8,7 @@ version = BACKDROP_VERSION dependencies[] = field dependencies[] = entity -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entityreference/tests/entityreference.tests.info b/docroot/core/modules/entityreference/tests/entityreference.tests.info index 2ed332cb..932c684d 100644 --- a/docroot/core/modules/entityreference/tests/entityreference.tests.info +++ b/docroot/core/modules/entityreference/tests/entityreference.tests.info @@ -28,7 +28,7 @@ description = Tests Entity Reference form widgets. group = Entity Reference file = entityreference.form.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info b/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info index 9816968c..a7c15406 100644 --- a/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info +++ b/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info @@ -8,7 +8,7 @@ dependencies[] = views dependencies[] = entityreference hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/field.info b/docroot/core/modules/field/field.info index 34ceb198..90d5713f 100644 --- a/docroot/core/modules/field/field.info +++ b/docroot/core/modules/field/field.info @@ -11,7 +11,7 @@ required = TRUE stylesheets[all][] = css/field.css -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info b/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info index 47dbdf04..5c9f32d0 100644 --- a/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info +++ b/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info @@ -9,7 +9,7 @@ backdrop = 1.x dependencies[] = field required = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info b/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info index edae00b2..c5eed225 100644 --- a/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info +++ b/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info @@ -4,7 +4,7 @@ description = Test Field SQL Storage module. group = Field API file = field_sql_storage.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/list/list.info b/docroot/core/modules/field/modules/list/list.info index 9529b49e..4bedb715 100644 --- a/docroot/core/modules/field/modules/list/list.info +++ b/docroot/core/modules/field/modules/list/list.info @@ -8,7 +8,7 @@ backdrop = 1.x dependencies[] = field dependencies[] = options -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/list/tests/list.tests.info b/docroot/core/modules/field/modules/list/tests/list.tests.info index a3c817bc..0f36535b 100644 --- a/docroot/core/modules/field/modules/list/tests/list.tests.info +++ b/docroot/core/modules/field/modules/list/tests/list.tests.info @@ -22,7 +22,7 @@ description = Test the List field Display formatting. group = Field types file = list.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/list/tests/list_test.info b/docroot/core/modules/field/modules/list/tests/list_test.info index ec3a9c44..c81da9d6 100644 --- a/docroot/core/modules/field/modules/list/tests/list_test.info +++ b/docroot/core/modules/field/modules/list/tests/list_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/number/number.info b/docroot/core/modules/field/modules/number/number.info index 58901c3f..c68bd797 100644 --- a/docroot/core/modules/field/modules/number/number.info +++ b/docroot/core/modules/field/modules/number/number.info @@ -7,7 +7,7 @@ version = BACKDROP_VERSION backdrop = 1.x dependencies[] = field -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/number/tests/number.tests.info b/docroot/core/modules/field/modules/number/tests/number.tests.info index 15cc508b..49380d64 100644 --- a/docroot/core/modules/field/modules/number/tests/number.tests.info +++ b/docroot/core/modules/field/modules/number/tests/number.tests.info @@ -10,7 +10,7 @@ description = Test settings for number fields. group = Field types file = number_settings.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/options/options.info b/docroot/core/modules/field/modules/options/options.info index 3f20fb5f..9a0d68e5 100644 --- a/docroot/core/modules/field/modules/options/options.info +++ b/docroot/core/modules/field/modules/options/options.info @@ -7,7 +7,7 @@ version = BACKDROP_VERSION backdrop = 1.x dependencies[] = field -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/options/tests/options.tests.info b/docroot/core/modules/field/modules/options/tests/options.tests.info index 5153eb69..00c68418 100644 --- a/docroot/core/modules/field/modules/options/tests/options.tests.info +++ b/docroot/core/modules/field/modules/options/tests/options.tests.info @@ -10,7 +10,7 @@ description = Test an options select on a list field with a dynamic allowed valu group = Field types file = options.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/text/tests/text.test b/docroot/core/modules/field/modules/text/tests/text.test index 2bc17c30..86898179 100644 --- a/docroot/core/modules/field/modules/text/tests/text.test +++ b/docroot/core/modules/field/modules/text/tests/text.test @@ -430,16 +430,16 @@ class TextSummaryTestCase extends BackdropWebTestCase { // Using no text format: $expected = array( "
\nHi\n
\n\nfolks\n
\n!\n
", - "
\n", - "
\nH", - "
\nHi", - "
\nHi\n", - "
\nHi\n<", - "
\nHi\n", - "
\nHi\n
", + "", + "\n
", + "\nH
", + "\nHi
", + "\nHi\n
", + "\nHi\n
", + "\nHi\n
", + "\nHi\n
", "\nHi\n
", "\nHi\n
", "\nHi\n
", @@ -513,7 +513,7 @@ class TextSummaryTestCase extends BackdropWebTestCase { // Test text_summary() for different sizes. for ($i = 0; $i <= 37; $i++) { - $this->assertTextSummary($text, $expected[$i], NULL, $i); + $this->assertTextSummary($text, $expected[$i], NULL, $i); $this->assertTextSummary($text, $expected_lb[$i], 'filtered_html', $i); } } diff --git a/docroot/core/modules/field/modules/text/tests/text.tests.info b/docroot/core/modules/field/modules/text/tests/text.tests.info index 8aa7705b..76198a6d 100644 --- a/docroot/core/modules/field/modules/text/tests/text.tests.info +++ b/docroot/core/modules/field/modules/text/tests/text.tests.info @@ -16,7 +16,7 @@ description = Check if the text field is correctly prepared for translation. group = Field types file = text.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/text/text.info b/docroot/core/modules/field/modules/text/text.info index 7e3f58d3..e6c6108a 100644 --- a/docroot/core/modules/field/modules/text/text.info +++ b/docroot/core/modules/field/modules/text/text.info @@ -8,7 +8,7 @@ backdrop = 1.x dependencies[] = field required = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/modules/text/text.module b/docroot/core/modules/field/modules/text/text.module index 06567925..0dd3e000 100644 --- a/docroot/core/modules/field/modules/text/text.module +++ b/docroot/core/modules/field/modules/text/text.module @@ -494,8 +494,8 @@ function text_summary($text, $format_id = NULL, $size = 600) { } } - // If the htmlcorrector filter is present, apply it to the generated summary. - if (isset($format->filters['filter_htmlcorrector'])) { + // Clean up any invalid HTML. + if (function_exists('_filter_htmlcorrector')) { $summary = _filter_htmlcorrector($summary); } diff --git a/docroot/core/modules/field/tests/field.tests.info b/docroot/core/modules/field/tests/field.tests.info index 728cd89c..70a48c17 100644 --- a/docroot/core/modules/field/tests/field.tests.info +++ b/docroot/core/modules/field/tests/field.tests.info @@ -82,7 +82,7 @@ description = Tests the Views field of the Field API integration. group = Field API file = field_views.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field/tests/field_test/field_test.info b/docroot/core/modules/field/tests/field_test/field_test.info index 62a53b85..4035fb4c 100644 --- a/docroot/core/modules/field/tests/field_test/field_test.info +++ b/docroot/core/modules/field/tests/field_test/field_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field_ui/field_ui.info b/docroot/core/modules/field_ui/field_ui.info index 06c9b73d..5dc5967a 100644 --- a/docroot/core/modules/field_ui/field_ui.info +++ b/docroot/core/modules/field_ui/field_ui.info @@ -8,7 +8,7 @@ version = BACKDROP_VERSION backdrop = 1.x dependencies[] = field -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field_ui/tests/field_ui.tests.info b/docroot/core/modules/field_ui/tests/field_ui.tests.info index cc676c81..ef33169e 100644 --- a/docroot/core/modules/field_ui/tests/field_ui.tests.info +++ b/docroot/core/modules/field_ui/tests/field_ui.tests.info @@ -22,7 +22,7 @@ description = Tests view mode functionality. group = Field UI file = field_ui.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info b/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info index b15964a3..12704921 100644 --- a/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info +++ b/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info @@ -6,7 +6,7 @@ version = BACKDROP_CORE hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/file/file.info b/docroot/core/modules/file/file.info index 96b3d041..ea951991 100644 --- a/docroot/core/modules/file/file.info +++ b/docroot/core/modules/file/file.info @@ -10,7 +10,7 @@ backdrop = 1.x required = TRUE dependencies[] = field -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/file/file.module b/docroot/core/modules/file/file.module index 8118da4f..1b54d26f 100644 --- a/docroot/core/modules/file/file.module +++ b/docroot/core/modules/file/file.module @@ -1143,6 +1143,9 @@ function file_ajax_upload() { $commands = array(); $commands[] = ajax_command_remove('.file-ajax-messages'); $commands[] = ajax_command_prepend(NULL, ' '); + $field_name = (string) reset($form_parents); + $wrapper_id = backdrop_html_id('edit-' . $field_name); + $commands[] = ajax_command_invoke('#' . $wrapper_id . ' .form-type-managed-file input[type="file"]', 'val', array('')); return array('#type' => 'ajax', '#commands' => $commands); } @@ -1408,6 +1411,10 @@ function file_managed_file_process($element, &$form_state, $form) { '#weight' => -10, ); + // Indicate that $element['#title'] should be used as the HTML label for the + // file upload field. + $element['#label_for'] = backdrop_html_id('edit-' . implode('-', array_merge($element['#parents'], array('upload')))); + if ($fid && $element['#file']) { $element['filename'] = array( '#type' => 'markup', @@ -1723,6 +1730,7 @@ function file_managed_file_browser_open($form, $form_state) { $options = array( 'dialogClass' => 'file-browser-container', 'width' => '90%', + 'modal' => TRUE, ); $html = ''; $html .= theme('status_messages'); @@ -1744,7 +1752,7 @@ function file_managed_file_browser_open($form, $form_state) { $commands = array(); $commands[] = ajax_command_settings($settings, TRUE); - $commands[] = ajax_command_open_modal_dialog($title, $html, $options); + $commands[] = ajax_command_open_dialog('#file-browser-modal', $title, $html, $options); return array('#type' => 'ajax', '#commands' => $commands); } @@ -1805,7 +1813,7 @@ function file_managed_file_browser_submit($form, &$form_state) { ); $commands[] = ajax_command_settings($settings, TRUE); } - $commands[] = ajax_command_close_modal_dialog(); + $commands[] = ajax_command_close_dialog('#file-browser-modal'); return array('#type' => 'ajax', '#commands' => $commands); } @@ -3340,13 +3348,13 @@ function file_view_file($file, $display = 'full', $langcode = NULL) { * That form will trigger the type classification of managed files that do not * currently have a type. This is often the case after upgrading from Drupal 7. * - * @param $classify + * @param bool|NULL $rebuild * (optional) The boolean value to be written. * * @return bool|NULL * The current value of the flag if no value was provided for $rebuild. * - * @see + * @see file_type_classify_batch() */ function file_needs_type_classification($rebuild = NULL) { if (!isset($rebuild)) { @@ -3363,8 +3371,8 @@ function file_needs_type_classification($rebuild = NULL) { /** * Batch operation callback to classify the types of managed files. * - * Unlike Drupal 7, the file_managed table in Backdrop contains a type column. - * This process classifies the file types when upgrading from a D7 site. + * Unlike Drupal 7, the file_managed table in Backdrop contains a type column. + * This process classifies the file types when upgrading from a D7 site. * * @see file_needs_type_classification() */ @@ -3388,7 +3396,7 @@ function file_type_classify_batch($fids, &$context) { /** * Batch 'finished' callback. - * + * * @see file_type_classify_batch() * @see file_needs_type_classification() */ diff --git a/docroot/core/modules/file/tests/file.test b/docroot/core/modules/file/tests/file.test index 6b657d77..0743371c 100644 --- a/docroot/core/modules/file/tests/file.test +++ b/docroot/core/modules/file/tests/file.test @@ -563,6 +563,29 @@ class FileTaxonomyTermTestCase extends BackdropWebTestCase { * that aren't related to fields into it. */ class FileManagedFileElementTestCase extends FileTestHelper { + + protected $originalDisplayErrorsValue; + + /** + * {@inheritdoc} + */ + public function setUp() { + parent::setUp(); + + // Disable the displaying of errors, so that the AJAX responses are not + // contaminated with error messages about exceeding the maximum POST size. + $this->originalDisplayErrorsValue = ini_set('display_errors', '0'); + } + + /** + * {@inheritdoc} + */ + public function tearDown() { + ini_set('display_errors', $this->originalDisplayErrorsValue); + + parent::tearDown(); + } + /** * Tests the managed_file element type. */ @@ -687,6 +710,43 @@ class FileManagedFileElementTestCase extends FileTestHelper { } } } + + /** + * Tests uploading a file that exceeds the maximum file size. + */ + public function testManagedFileExceedMaximumFileSize() { + $path = 'file/test/0/0'; + $this->backdropGet($path); + + // Create a test file that exceeds the maximum POST size with 1 kilobyte. + $post_max_size = $this->_postMaxSizeToInteger(ini_get('post_max_size')); + $filename = 'text-exceeded'; + simpletest_generate_file($filename, ceil(($post_max_size + 1024) / 1024), 1024, 'text'); + $uri = 'public://' . $filename . '.txt'; + $input_base_name = 'file'; + $edit = array('files[' . $input_base_name . ']' => backdrop_realpath($uri)); + $this->backdropPostAJAX(NULL, $edit, $input_base_name . '_upload_button'); + $this->assertFieldByXpath('//input[@type="submit"]', t('Upload'), 'After uploading a file that exceeds the maximum file size, the "Upload" button is displayed.'); + $this->backdropPost($path, array(), t('Save')); + $this->assertRaw(t('The file id is %fid.', array('%fid' => 0)), 'Submitted without a file.'); + } + + /** + * Converts php.ini post_max_size value to integer. + * + * @param string $string + * The value from php.ini. + * + * @return int + * Converted value. + */ + protected function _postMaxSizeToInteger($string) { + sscanf($string, '%u%c', $number, $suffix); + if (isset($suffix)) { + $number = $number * pow(1024, strpos(' KMG', strtoupper($suffix))); + } + return $number; + } } /** diff --git a/docroot/core/modules/file/tests/file.tests.info b/docroot/core/modules/file/tests/file.tests.info index 5cd43f42..4c607710 100644 --- a/docroot/core/modules/file/tests/file.tests.info +++ b/docroot/core/modules/file/tests/file.tests.info @@ -136,7 +136,7 @@ description = Test overriding file entity attributes. group = File file = file.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/file/tests/file_module_test/file_module_test.info b/docroot/core/modules/file/tests/file_module_test/file_module_test.info index 3b028cc8..a2005bf9 100644 --- a/docroot/core/modules/file/tests/file_module_test/file_module_test.info +++ b/docroot/core/modules/file/tests/file_module_test/file_module_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/filter/filter.info b/docroot/core/modules/filter/filter.info index 09eba7d5..9204e649 100644 --- a/docroot/core/modules/filter/filter.info +++ b/docroot/core/modules/filter/filter.info @@ -11,7 +11,7 @@ required = TRUE configure = admin/config/content/formats -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/filter/filter.pages.inc b/docroot/core/modules/filter/filter.pages.inc index d1da3eb1..881b764d 100644 --- a/docroot/core/modules/filter/filter.pages.inc +++ b/docroot/core/modules/filter/filter.pages.inc @@ -464,9 +464,7 @@ function filter_format_editor_link_form_submit($form, &$form_state) { } } else { - // Modify references to other URIs if not an external link. - $url = (substr($uri, 0, 4) == 'http') ? $uri : substr(base_path(), 0, -1) . $uri; - $form_state['values']['attributes']['href'] = $url; + $form_state['values']['attributes']['href'] = $uri; // Remove any reference to a data file. unset($form_state['values']['fid']); $form_state['values']['attributes']['data-file-id'] = NULL; diff --git a/docroot/core/modules/filter/tests/filter.tests.info b/docroot/core/modules/filter/tests/filter.tests.info index 19a4ae1d..e2f10081 100644 --- a/docroot/core/modules/filter/tests/filter.tests.info +++ b/docroot/core/modules/filter/tests/filter.tests.info @@ -76,7 +76,7 @@ description = Validate correct handling of URLs inserted via editor link dialog. group = Filter file = filter_dialog.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/filter/tests/filter_formtest.info b/docroot/core/modules/filter/tests/filter_formtest.info index 965001ad..4e49bfe2 100644 --- a/docroot/core/modules/filter/tests/filter_formtest.info +++ b/docroot/core/modules/filter/tests/filter_formtest.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/image/image.info b/docroot/core/modules/image/image.info index c0f5c358..03842458 100644 --- a/docroot/core/modules/image/image.info +++ b/docroot/core/modules/image/image.info @@ -10,7 +10,7 @@ backdrop = 1.x dependencies[] = file configure = admin/config/media/image-styles -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/image/tests/image.tests.info b/docroot/core/modules/image/tests/image.tests.info index 45896741..1377c98b 100644 --- a/docroot/core/modules/image/tests/image.tests.info +++ b/docroot/core/modules/image/tests/image.tests.info @@ -70,7 +70,7 @@ description = Test image style and attribute tokens. group = Image file = token.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/image/tests/image_module_test/image_module_test.info b/docroot/core/modules/image/tests/image_module_test/image_module_test.info index e6638890..4b20ee9b 100644 --- a/docroot/core/modules/image/tests/image_module_test/image_module_test.info +++ b/docroot/core/modules/image/tests/image_module_test/image_module_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/installer/installer.info b/docroot/core/modules/installer/installer.info index 57059c7e..f52a2401 100644 --- a/docroot/core/modules/installer/installer.info +++ b/docroot/core/modules/installer/installer.info @@ -8,7 +8,7 @@ tags[] = System backdrop = 1.x dependencies[] = update -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info b/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info index 45762a42..b1635472 100644 --- a/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info +++ b/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info b/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info index 0148e7d9..0e5d6343 100644 --- a/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info +++ b/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info b/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info index 8e2ca151..cbfa3590 100644 --- a/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info +++ b/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/installer/tests/installer.tests.info b/docroot/core/modules/installer/tests/installer.tests.info index 6dac1bb5..537ed6a3 100644 --- a/docroot/core/modules/installer/tests/installer.tests.info +++ b/docroot/core/modules/installer/tests/installer.tests.info @@ -10,7 +10,7 @@ description = Tests installer browse functionality. group = Installer (module) file = installer.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/installer/tests/installer_test/installer_test.info b/docroot/core/modules/installer/tests/installer_test/installer_test.info index 051d52f0..e39ea470 100644 --- a/docroot/core/modules/installer/tests/installer_test/installer_test.info +++ b/docroot/core/modules/installer/tests/installer_test/installer_test.info @@ -7,7 +7,7 @@ type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/language/language.info b/docroot/core/modules/language/language.info index f1e74dc6..a4fead1d 100644 --- a/docroot/core/modules/language/language.info +++ b/docroot/core/modules/language/language.info @@ -7,7 +7,7 @@ type = module backdrop = 1.x configure = admin/config/regional/language -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/language/tests/language.tests.info b/docroot/core/modules/language/tests/language.tests.info index 69861dd3..1fe8aa86 100644 --- a/docroot/core/modules/language/tests/language.tests.info +++ b/docroot/core/modules/language/tests/language.tests.info @@ -4,7 +4,7 @@ description = Adds a new language and tests changing its status and the default group = Language file = language.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/layout/layout.info b/docroot/core/modules/layout/layout.info index 4d00b439..25c41a0d 100644 --- a/docroot/core/modules/layout/layout.info +++ b/docroot/core/modules/layout/layout.info @@ -8,7 +8,7 @@ version = BACKDROP_VERSION backdrop = 1.x required = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/layout/tests/layout.tests.info b/docroot/core/modules/layout/tests/layout.tests.info index ba808ec7..a6165f39 100644 --- a/docroot/core/modules/layout/tests/layout.tests.info +++ b/docroot/core/modules/layout/tests/layout.tests.info @@ -64,7 +64,7 @@ description = Tests layout paths, like the Default Layout. group = Layout file = layout.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/layout/tests/layout_test/layout_test.info b/docroot/core/modules/layout/tests/layout_test/layout_test.info index b1b7afc2..bc0dc6c4 100644 --- a/docroot/core/modules/layout/tests/layout_test/layout_test.info +++ b/docroot/core/modules/layout/tests/layout_test/layout_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/link/link.info b/docroot/core/modules/link/link.info index aaa745e4..ebed7bca 100644 --- a/docroot/core/modules/link/link.info +++ b/docroot/core/modules/link/link.info @@ -7,7 +7,7 @@ version = BACKDROP_VERSION backdrop = 1.x -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/link/tests/link.tests.info b/docroot/core/modules/link/tests/link.tests.info index 718ead5b..b392bb1b 100644 --- a/docroot/core/modules/link/tests/link.tests.info +++ b/docroot/core/modules/link/tests/link.tests.info @@ -28,7 +28,7 @@ description = Tests the link_validate_url() function by itself, without invoking group = Link file = link.validate.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/locale/locale.info b/docroot/core/modules/locale/locale.info index ec4a84b7..1708d8ec 100644 --- a/docroot/core/modules/locale/locale.info +++ b/docroot/core/modules/locale/locale.info @@ -8,7 +8,7 @@ backdrop = 1.x dependencies[] = language -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/locale/tests/locale.tests.info b/docroot/core/modules/locale/tests/locale.tests.info index 8a81e421..92e87d34 100644 --- a/docroot/core/modules/locale/tests/locale.tests.info +++ b/docroot/core/modules/locale/tests/locale.tests.info @@ -130,7 +130,7 @@ description = Tests locale translation safe string handling. group = Locale file = locale.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/locale/tests/locale_test/locale_test.info b/docroot/core/modules/locale/tests/locale_test/locale_test.info index a204f647..db8fbabd 100644 --- a/docroot/core/modules/locale/tests/locale_test/locale_test.info +++ b/docroot/core/modules/locale/tests/locale_test/locale_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/menu/menu.info b/docroot/core/modules/menu/menu.info index 99a77ee1..ff1d6263 100644 --- a/docroot/core/modules/menu/menu.info +++ b/docroot/core/modules/menu/menu.info @@ -10,7 +10,7 @@ backdrop = 1.x configure = admin/structure/menu -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/menu/tests/menu.tests.info b/docroot/core/modules/menu/tests/menu.tests.info index 0111da95..13fdf56c 100644 --- a/docroot/core/modules/menu/tests/menu.tests.info +++ b/docroot/core/modules/menu/tests/menu.tests.info @@ -16,7 +16,7 @@ description = Test menu item creation and parent availability with language supp group = Menu file = menu_language.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/node/node.info b/docroot/core/modules/node/node.info index 4458ff68..32ac478f 100644 --- a/docroot/core/modules/node/node.info +++ b/docroot/core/modules/node/node.info @@ -9,7 +9,7 @@ required = TRUE dependencies[] = entity configure = admin/structure/types -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/node/node.module b/docroot/core/modules/node/node.module index c3fd9020..01d4fb87 100644 --- a/docroot/core/modules/node/node.module +++ b/docroot/core/modules/node/node.module @@ -1542,6 +1542,26 @@ function node_user_predelete($account) { ->execute(); } +/** + * Implements hook_user_update(). + */ +function node_user_update($account) { + $orig = $account->original; + if ($account->name != $orig->name || $account->picture != $orig->picture || $account->data != $orig->data) { + $nids = db_select('node', 'n') + ->fields('n', array('nid')) + ->condition('uid', $account->uid) + ->execute() + ->fetchCol(); + + if (!empty($nids)) { + // Flush entity cache of nodes this user authored, to prevent outdated + // info (like old username) in cached data. + cache('entity_node')->deleteMultiple($nids); + } + } +} + /** * Access callback: Checks node revision access. * diff --git a/docroot/core/modules/node/node.types.inc b/docroot/core/modules/node/node.types.inc index 153a4894..5ac78dd4 100644 --- a/docroot/core/modules/node/node.types.inc +++ b/docroot/core/modules/node/node.types.inc @@ -105,7 +105,7 @@ function node_type_form($form, &$form_state, $type = NULL) { '#title' => t('Name'), '#type' => 'textfield', '#default_value' => $type->name, - '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the Add content page. It is recommended that this name begin with a capital letter and contain only letters, numbers, and spaces. This name must be unique.'), + '#description' => t('The human-readable name of this content type; as to be displayed on the Add content page. It is recommended that this name begins with a capital letter and contains only letters, numbers, and spaces. This name must be unique.', array('@url' => url('node/add'))), '#required' => TRUE, '#size' => 30, ); @@ -118,16 +118,34 @@ function node_type_form($form, &$form_state, $type = NULL) { '#machine_name' => array( 'exists' => 'node_type_load', ), - '#description' => t('A unique machine-readable name for this content type. It must only contain lowercase letters, numbers, and underscores. This name will be used for constructing the URL of the %node-add page, in which underscores will be converted into hyphens.', array( - '%node-add' => t('Add content'), - )), + '#description' => t('A unique machine-readable name for this content type. It must only contain lowercase letters, numbers, and underscores. This name will be used for constructing the URL of the Add content page, in which underscores will be converted into hyphens.', array('@url' => url('node/add'))), ); + // Add a toggle for the "Description" field. + $form['description_enable'] = array( + '#type' => 'checkbox', + '#title' => t('Provide description'), + '#default_value' => $type->description != '' ? 1 : 0, + ); $form['description'] = array( - '#title' => t('Description'), '#type' => 'textarea', + '#title' => t('Description'), + '#title_display' => 'invisible', '#default_value' => $type->description, - '#description' => t('Describe this content type. The text will be displayed on the Add content page.'), + '#states' => array( + 'visible' => array( + ':input[name="description_enable"]' => array('checked' => TRUE), + ), + ), + ); + // We need to implement the description as a separate form element, so that it + // is shown for both the checkbox and the text field. + $form['description_description'] = array( + '#type' => 'item', + // Fields of #type 'item' do not support #attributes - use + // #wrapper_attributes instead. + '#wrapper_attributes' => array('class' => array('description', 'form-item-description')), + '#markup' => t('This text will be shown on the Add content page.', array('@url' => url('node/add'))), ); // Prepare various messages about automatic permission assignment, and @@ -208,7 +226,10 @@ function node_type_form($form, &$form_state, $type = NULL) { // to people even if they don't have access to the "Permissions" tab. $form['permissions_message_container'] = array( '#type' => 'container', - '#attributes' => array('class' => array('messages', $permissions_message_type)), + '#attributes' => array('class' => array( + 'messages', + $permissions_message_type, + )), ); $form['permissions_message_container']['message'] = array( '#type' => 'markup', @@ -244,12 +265,34 @@ function node_type_form($form, &$form_state, $type = NULL) { $form['submission']['title_label']['#description'] = t('This content type does not have a title field.'); $form['submission']['title_label']['#required'] = FALSE; } + + // Add a toggle for the "Explanation or submission guidelines" field. + $form['submission']['help_enable'] = array( + '#type' => 'checkbox', + '#title' => t('Provide explanation or submission guidelines'), + '#default_value' => $type->help != '' ? 1 : 0, + ); $form['submission']['help'] = array( '#type' => 'textarea', '#title' => t('Explanation or submission guidelines'), + '#title_display' => 'invisible', '#default_value' => $type->help, - '#description' => t('This text will be displayed at the top of the page when creating or editing content of this type.'), + '#states' => array( + 'visible' => array( + ':input[name="help_enable"]' => array('checked' => TRUE), + ), + ), + ); + // We need to implement the description as a separate form element, so that it + // is shown for both the checkbox and the text field. + $form['submission']['help_description'] = array( + '#type' => 'item', + // Fields of #type 'item' do not support #attributes - use + // #wrapper_attributes instead. + '#wrapper_attributes' => array('class' => array('description', 'form-item-description')), + '#markup' => t('This text will be displayed at the top of the page when creating or editing content of this type.'), ); + $form['submission']['node_preview'] = array( '#type' => 'radios', '#title' => t('Preview before submitting'), diff --git a/docroot/core/modules/node/tests/node.test b/docroot/core/modules/node/tests/node.test index 661aff32..ec63a5a8 100644 --- a/docroot/core/modules/node/tests/node.test +++ b/docroot/core/modules/node/tests/node.test @@ -3784,7 +3784,7 @@ class NodePageCacheTest extends NodeWebTestCase { * Make sure that creating a new node does not affect existing entity cache * records, and updating a node only acts on the affected cid. */ - function testNodeUpdateInsertCache() { + protected function testNodeUpdateInsertCache() { $node_one = $this->backdropCreateNode(array('title' => 'Node one')); $node_two = $this->backdropCreateNode(array('title' => 'Node two')); $ids = array($node_one->nid, $node_two->nid); @@ -3818,6 +3818,30 @@ class NodePageCacheTest extends NodeWebTestCase { $this->assertEqual(count($cached_after_insert), 3, 'All three nodes have a record in table cache_entity_node.'); $this->assertEqual($cached_after_insert[1]->created, $cached[1]->created, 'Cache timestamp of node 1 is unchanged.'); } + + /** + * Check that cached node info does not run out of sync with user data. + */ + protected function testNodeSaveAfterUsernameChange() { + $author = $this->backdropCreateUser(array('create page content')); + $node = $this->backdropCreateNode(array( + 'uid' => $author->uid, + 'name' => $author->name, + )); + + // Trigger entity cache. + $this->backdropGet('node/' . $node->nid); + + // Simulate a username change (without actual form interaction). + $author->name = 'new_name'; + user_save($author); + + // Freshly load data and compare. + $user = entity_load('user', $author->uid); + $node_after = entity_load('node', $node->nid); + $this->assertEqual($user->name, $node_after->name, 'Name property in loaded node is equal to username after change'); + } + } /** diff --git a/docroot/core/modules/node/tests/node.tests.info b/docroot/core/modules/node/tests/node.tests.info index e5dacfd7..29bb329e 100644 --- a/docroot/core/modules/node/tests/node.tests.info +++ b/docroot/core/modules/node/tests/node.tests.info @@ -226,7 +226,7 @@ description = Tests the new node states for Draft, Publish Now and Schedule Publ group = Node file = node.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/node/tests/node_access_test/node_access_test.info b/docroot/core/modules/node/tests/node_access_test/node_access_test.info index 18dc5a51..faf99566 100644 --- a/docroot/core/modules/node/tests/node_access_test/node_access_test.info +++ b/docroot/core/modules/node/tests/node_access_test/node_access_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info b/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info index e62593c6..9c698a46 100644 --- a/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info +++ b/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/node/tests/node_test/node_test.info b/docroot/core/modules/node/tests/node_test/node_test.info index 662bf83b..a70d21c0 100644 --- a/docroot/core/modules/node/tests/node_test/node_test.info +++ b/docroot/core/modules/node/tests/node_test/node_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info b/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info index c5e2b1d0..b6b11c0f 100644 --- a/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info +++ b/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/path/path.info b/docroot/core/modules/path/path.info index d9445235..e85d8f32 100644 --- a/docroot/core/modules/path/path.info +++ b/docroot/core/modules/path/path.info @@ -8,7 +8,7 @@ backdrop = 1.x configure = admin/config/urls/path -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/path/tests/path.tests.info b/docroot/core/modules/path/tests/path.tests.info index 312fc348..cd6ff5ba 100644 --- a/docroot/core/modules/path/tests/path.tests.info +++ b/docroot/core/modules/path/tests/path.tests.info @@ -64,7 +64,7 @@ description = Tests tokens provided by Path. group = Path file = path_pattern.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/redirect/redirect.info b/docroot/core/modules/redirect/redirect.info index c6f62d1d..4ca0f772 100644 --- a/docroot/core/modules/redirect/redirect.info +++ b/docroot/core/modules/redirect/redirect.info @@ -8,7 +8,7 @@ version = BACKDROP_VERSION configure = admin/config/urls/redirect/settings -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/redirect/tests/redirect.tests.info b/docroot/core/modules/redirect/tests/redirect.tests.info index cbc802d1..b03f26ed 100644 --- a/docroot/core/modules/redirect/tests/redirect.tests.info +++ b/docroot/core/modules/redirect/tests/redirect.tests.info @@ -10,7 +10,7 @@ description = Test interface functionality. group = Redirect file = redirect.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/search/search.info b/docroot/core/modules/search/search.info index 2c858779..f64cbf62 100644 --- a/docroot/core/modules/search/search.info +++ b/docroot/core/modules/search/search.info @@ -10,7 +10,7 @@ configure = admin/config/search/settings stylesheets[all][] = search.theme.css -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/search/tests/search.tests.info b/docroot/core/modules/search/tests/search.tests.info index 2be917e9..6850fb94 100644 --- a/docroot/core/modules/search/tests/search.tests.info +++ b/docroot/core/modules/search/tests/search.tests.info @@ -124,7 +124,7 @@ description = Check that search works with numeric locale settings. group = Search file = search.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info b/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info index 1595016f..3e203e6e 100644 --- a/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info +++ b/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info b/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info index d26c7a0a..30c1a5bd 100644 --- a/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info +++ b/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/simpletest.info b/docroot/core/modules/simpletest/simpletest.info index b343b6af..4794fbc0 100644 --- a/docroot/core/modules/simpletest/simpletest.info +++ b/docroot/core/modules/simpletest/simpletest.info @@ -8,7 +8,7 @@ backdrop = 1.x configure = admin/config/development/testing/settings -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/actions_loop_test.info b/docroot/core/modules/simpletest/tests/actions_loop_test.info index 3ac9ec8d..946eff95 100644 --- a/docroot/core/modules/simpletest/tests/actions_loop_test.info +++ b/docroot/core/modules/simpletest/tests/actions_loop_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/ajax_forms_test.info b/docroot/core/modules/simpletest/tests/ajax_forms_test.info index 59e8ae68..f1b63c6e 100644 --- a/docroot/core/modules/simpletest/tests/ajax_forms_test.info +++ b/docroot/core/modules/simpletest/tests/ajax_forms_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/ajax_test.info b/docroot/core/modules/simpletest/tests/ajax_test.info index d6fbf628..f7266066 100644 --- a/docroot/core/modules/simpletest/tests/ajax_test.info +++ b/docroot/core/modules/simpletest/tests/ajax_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info b/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info index 583c9bcb..82ec4b5b 100644 --- a/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info +++ b/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info b/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info index fa65706a..36ef3afb 100644 --- a/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info +++ b/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/batch_test.info b/docroot/core/modules/simpletest/tests/batch_test.info index 6122c3b7..8ac6a336 100644 --- a/docroot/core/modules/simpletest/tests/batch_test.info +++ b/docroot/core/modules/simpletest/tests/batch_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/boot_test_1.info b/docroot/core/modules/simpletest/tests/boot_test_1.info index ee337174..2a8f8305 100644 --- a/docroot/core/modules/simpletest/tests/boot_test_1.info +++ b/docroot/core/modules/simpletest/tests/boot_test_1.info @@ -6,7 +6,7 @@ package = Testing version = VERSION hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/boot_test_2.info b/docroot/core/modules/simpletest/tests/boot_test_2.info index 068183e2..304d1871 100644 --- a/docroot/core/modules/simpletest/tests/boot_test_2.info +++ b/docroot/core/modules/simpletest/tests/boot_test_2.info @@ -6,7 +6,7 @@ package = Testing version = VERSION hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/common.test b/docroot/core/modules/simpletest/tests/common.test index 9c6f68dc..2a1a6277 100644 --- a/docroot/core/modules/simpletest/tests/common.test +++ b/docroot/core/modules/simpletest/tests/common.test @@ -76,6 +76,26 @@ class CommonURLWebTestCase extends BackdropWebTestCase { $link = l($text, $path); $sanitized_path = check_url(url($path)); $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, format_string('XSS attack @path was filtered', array('@path' => $path))); + + // Verify that a dangerous protocol is sanitized. + $text = $this->randomName(); + $path = "javascript:alert('XSS')"; + $link = l($text, $path, array('external' => TRUE)); + $this->assertTrue(strpos($link, 'javascript:') === FALSE, 'Dangerous protocol javascript: was sanitized.'); + + // Verify that these harmless javascript paths are left intact for BC. + $special_case_js_paths = array( + 'javascript:void()', + 'javascript:void();', + 'javascript:void(0)', + 'javascript:void(0);', + 'JavaScript:Void(0)', + ); + foreach ($special_case_js_paths as $path) { + $text = $this->randomName(); + $link = l($text, $path, array('external' => TRUE)); + $this->assertTrue(strpos($link, $path) !== FALSE, format_string('Harmless @path was not sanitized.', array('@path' => $path))); + } } /* diff --git a/docroot/core/modules/simpletest/tests/common_test.info b/docroot/core/modules/simpletest/tests/common_test.info index 2b6c9c3c..cfeae9e1 100644 --- a/docroot/core/modules/simpletest/tests/common_test.info +++ b/docroot/core/modules/simpletest/tests/common_test.info @@ -8,7 +8,7 @@ stylesheets[all][] = common_test.css stylesheets[print][] = common_test.print.css hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/common_test_cron_helper.info b/docroot/core/modules/simpletest/tests/common_test_cron_helper.info index efb0d11c..bc690217 100644 --- a/docroot/core/modules/simpletest/tests/common_test_cron_helper.info +++ b/docroot/core/modules/simpletest/tests/common_test_cron_helper.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info b/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info index 648155af..5604e262 100644 --- a/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info +++ b/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/database_test.info b/docroot/core/modules/simpletest/tests/database_test.info index 35cbd5a7..9ea335ad 100644 --- a/docroot/core/modules/simpletest/tests/database_test.info +++ b/docroot/core/modules/simpletest/tests/database_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/dependency_test1.info b/docroot/core/modules/simpletest/tests/dependency_test1.info index 1f521f1a..d3bb942f 100644 --- a/docroot/core/modules/simpletest/tests/dependency_test1.info +++ b/docroot/core/modules/simpletest/tests/dependency_test1.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/dependency_test2.info b/docroot/core/modules/simpletest/tests/dependency_test2.info index 2633604c..6c1b7323 100644 --- a/docroot/core/modules/simpletest/tests/dependency_test2.info +++ b/docroot/core/modules/simpletest/tests/dependency_test2.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/dependency_test3.info b/docroot/core/modules/simpletest/tests/dependency_test3.info index 2cf645d8..5dedf710 100644 --- a/docroot/core/modules/simpletest/tests/dependency_test3.info +++ b/docroot/core/modules/simpletest/tests/dependency_test3.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/error_test.info b/docroot/core/modules/simpletest/tests/error_test.info index 3fa41d3b..6f3acbd1 100644 --- a/docroot/core/modules/simpletest/tests/error_test.info +++ b/docroot/core/modules/simpletest/tests/error_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/file_test.info b/docroot/core/modules/simpletest/tests/file_test.info index 9f3453b8..10e13a94 100644 --- a/docroot/core/modules/simpletest/tests/file_test.info +++ b/docroot/core/modules/simpletest/tests/file_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/filetransfer.test b/docroot/core/modules/simpletest/tests/filetransfer.test index f2c6a2d3..c221ffd5 100644 --- a/docroot/core/modules/simpletest/tests/filetransfer.test +++ b/docroot/core/modules/simpletest/tests/filetransfer.test @@ -109,10 +109,9 @@ class TestFileTransfer extends FileTransfer { } function connect() { - $parts = explode(':', $this->hostname); - $port = (count($parts) == 2) ? $parts[1] : $this->port; - $this->connection = new MockTestConnection(); - $this->connection->connectionString = 'test://' . urlencode((string) $this->username) . ':' . urlencode((string) $this->password) . "@$this->host:$this->port/"; + $connection = new MockTestConnection(); + $connection->connectionString = 'test://' . urlencode((string) $this->username) . ':' . urlencode((string) $this->password) . "@$this->host:$this->port/"; + $this->connection = $connection; } function copyFileJailed($source, $destination) { diff --git a/docroot/core/modules/simpletest/tests/filter_test.info b/docroot/core/modules/simpletest/tests/filter_test.info index 86c060ee..fe9c13b8 100644 --- a/docroot/core/modules/simpletest/tests/filter_test.info +++ b/docroot/core/modules/simpletest/tests/filter_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/form_test.info b/docroot/core/modules/simpletest/tests/form_test.info index 2917bfe3..3fbdc82a 100644 --- a/docroot/core/modules/simpletest/tests/form_test.info +++ b/docroot/core/modules/simpletest/tests/form_test.info @@ -7,7 +7,7 @@ backdrop = 1.x dependencies[] = file hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/image_test.info b/docroot/core/modules/simpletest/tests/image_test.info index 0091c513..e4d5ad54 100644 --- a/docroot/core/modules/simpletest/tests/image_test.info +++ b/docroot/core/modules/simpletest/tests/image_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/menu_test.info b/docroot/core/modules/simpletest/tests/menu_test.info index 957d6d84..a15c0bd9 100644 --- a/docroot/core/modules/simpletest/tests/menu_test.info +++ b/docroot/core/modules/simpletest/tests/menu_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/module_test.info b/docroot/core/modules/simpletest/tests/module_test.info index cafecaee..ece65f8b 100644 --- a/docroot/core/modules/simpletest/tests/module_test.info +++ b/docroot/core/modules/simpletest/tests/module_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/path_test.info b/docroot/core/modules/simpletest/tests/path_test.info index 6b5bc95e..b6a19a73 100644 --- a/docroot/core/modules/simpletest/tests/path_test.info +++ b/docroot/core/modules/simpletest/tests/path_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/requirements1_test.info b/docroot/core/modules/simpletest/tests/requirements1_test.info index f6d2174b..b04f7f5d 100644 --- a/docroot/core/modules/simpletest/tests/requirements1_test.info +++ b/docroot/core/modules/simpletest/tests/requirements1_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/requirements2_test.info b/docroot/core/modules/simpletest/tests/requirements2_test.info index 5d0e9ecc..96c7bad0 100644 --- a/docroot/core/modules/simpletest/tests/requirements2_test.info +++ b/docroot/core/modules/simpletest/tests/requirements2_test.info @@ -8,7 +8,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/session_test.info b/docroot/core/modules/simpletest/tests/session_test.info index ef30393c..dc36284f 100644 --- a/docroot/core/modules/simpletest/tests/session_test.info +++ b/docroot/core/modules/simpletest/tests/session_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/simpletest.tests.info b/docroot/core/modules/simpletest/tests/simpletest.tests.info index f75e3ee2..baedbc3a 100644 --- a/docroot/core/modules/simpletest/tests/simpletest.tests.info +++ b/docroot/core/modules/simpletest/tests/simpletest.tests.info @@ -1372,7 +1372,7 @@ description = Test the file tokens. group = Token file = token.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_dependencies_test.info b/docroot/core/modules/simpletest/tests/system_dependencies_test.info index 667ca3c4..08e7a571 100644 --- a/docroot/core/modules/simpletest/tests/system_dependencies_test.info +++ b/docroot/core/modules/simpletest/tests/system_dependencies_test.info @@ -7,7 +7,7 @@ backdrop = 1.x hidden = TRUE dependencies[] = _missing_dependency -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info index 899dcd53..aba5cc92 100644 --- a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info +++ b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info @@ -7,7 +7,7 @@ backdrop = 1.x hidden = TRUE dependencies[] = system_incompatible_core_version_test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info index 9c71e89e..a0d3609c 100644 --- a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info +++ b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info @@ -6,7 +6,7 @@ type = module backdrop = 0.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info index 35b90f6c..5b13bf1d 100644 --- a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info +++ b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info @@ -8,7 +8,7 @@ hidden = TRUE ; system_incompatible_module_version_test declares version 1.0 dependencies[] = system_incompatible_module_version_test (>2.0) -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info index 7d2d15c0..2f5e829f 100644 --- a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info +++ b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_project_namespace_test.info b/docroot/core/modules/simpletest/tests/system_project_namespace_test.info index 98694f5c..698cc6f2 100644 --- a/docroot/core/modules/simpletest/tests/system_project_namespace_test.info +++ b/docroot/core/modules/simpletest/tests/system_project_namespace_test.info @@ -7,7 +7,7 @@ backdrop = 1.x hidden = TRUE dependencies[] = backdrop:filter -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/system_test.info b/docroot/core/modules/simpletest/tests/system_test.info index aeb7bdbd..34c26b6d 100644 --- a/docroot/core/modules/simpletest/tests/system_test.info +++ b/docroot/core/modules/simpletest/tests/system_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/taxonomy_test.info b/docroot/core/modules/simpletest/tests/taxonomy_test.info index a53e29cd..130a0b6c 100644 --- a/docroot/core/modules/simpletest/tests/taxonomy_test.info +++ b/docroot/core/modules/simpletest/tests/taxonomy_test.info @@ -7,7 +7,7 @@ backdrop = 1.x hidden = TRUE dependencies[] = taxonomy -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/theme_test.info b/docroot/core/modules/simpletest/tests/theme_test.info index e7328ce2..82143bb1 100644 --- a/docroot/core/modules/simpletest/tests/theme_test.info +++ b/docroot/core/modules/simpletest/tests/theme_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info index 715f2585..c8882a43 100644 --- a/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info +++ b/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info @@ -8,7 +8,7 @@ hidden = TRUE settings[basetheme_only] = base theme value settings[subtheme_override] = base theme value -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info index b85a1b00..f6d0e3ec 100644 --- a/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info +++ b/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info @@ -8,7 +8,7 @@ hidden = TRUE settings[subtheme_override] = subtheme value -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info b/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info index 1277ac2e..e1ecbd57 100644 --- a/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info +++ b/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info @@ -19,7 +19,7 @@ stylesheets[all][] = system.css settings[theme_test_setting] = default value -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info b/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info index 3c5fd5d3..58df6ae5 100644 --- a/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info +++ b/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info @@ -5,7 +5,7 @@ backdrop = 1.x type = theme hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/token_test.info b/docroot/core/modules/simpletest/tests/token_test.info index 6230205e..5610588c 100644 --- a/docroot/core/modules/simpletest/tests/token_test.info +++ b/docroot/core/modules/simpletest/tests/token_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/update_d7_test_1.info b/docroot/core/modules/simpletest/tests/update_d7_test_1.info index 50eaaff9..99ff7dce 100644 --- a/docroot/core/modules/simpletest/tests/update_d7_test_1.info +++ b/docroot/core/modules/simpletest/tests/update_d7_test_1.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/update_d7_test_2.info b/docroot/core/modules/simpletest/tests/update_d7_test_2.info index 50eaaff9..99ff7dce 100644 --- a/docroot/core/modules/simpletest/tests/update_d7_test_2.info +++ b/docroot/core/modules/simpletest/tests/update_d7_test_2.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/update_script_test.info b/docroot/core/modules/simpletest/tests/update_script_test.info index f1bce665..13aa18be 100644 --- a/docroot/core/modules/simpletest/tests/update_script_test.info +++ b/docroot/core/modules/simpletest/tests/update_script_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/update_test_1.info b/docroot/core/modules/simpletest/tests/update_test_1.info index ef82e1d9..c5d5c441 100644 --- a/docroot/core/modules/simpletest/tests/update_test_1.info +++ b/docroot/core/modules/simpletest/tests/update_test_1.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/update_test_2.info b/docroot/core/modules/simpletest/tests/update_test_2.info index ef82e1d9..c5d5c441 100644 --- a/docroot/core/modules/simpletest/tests/update_test_2.info +++ b/docroot/core/modules/simpletest/tests/update_test_2.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/update_test_3.info b/docroot/core/modules/simpletest/tests/update_test_3.info index ef82e1d9..c5d5c441 100644 --- a/docroot/core/modules/simpletest/tests/update_test_3.info +++ b/docroot/core/modules/simpletest/tests/update_test_3.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/simpletest/tests/url_alter_test.info b/docroot/core/modules/simpletest/tests/url_alter_test.info index 6ea1fdd3..cc66e439 100644 --- a/docroot/core/modules/simpletest/tests/url_alter_test.info +++ b/docroot/core/modules/simpletest/tests/url_alter_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/syslog/syslog.info b/docroot/core/modules/syslog/syslog.info index a5c3a80f..41274b34 100644 --- a/docroot/core/modules/syslog/syslog.info +++ b/docroot/core/modules/syslog/syslog.info @@ -9,7 +9,7 @@ backdrop = 1.x configure = admin/config/development/logging -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/syslog/tests/syslog.tests.info b/docroot/core/modules/syslog/tests/syslog.tests.info index bbf2eaf4..d5308135 100644 --- a/docroot/core/modules/syslog/tests/syslog.tests.info +++ b/docroot/core/modules/syslog/tests/syslog.tests.info @@ -4,7 +4,7 @@ description = Test syslog settings. group = Syslog file = syslog.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/system/css/system.theme.css b/docroot/core/modules/system/css/system.theme.css index ac09ade3..9d1b345f 100644 --- a/docroot/core/modules/system/css/system.theme.css +++ b/docroot/core/modules/system/css/system.theme.css @@ -105,6 +105,9 @@ label.option { display: inline; font-weight: normal; } +.form-item-description-enable label.option { + font-weight: bold; +} .form-checkboxes .form-item, .form-radios .form-item { margin-top: 0.4em; diff --git a/docroot/core/modules/system/system.api.php b/docroot/core/modules/system/system.api.php index c96d2584..5b0334a2 100644 --- a/docroot/core/modules/system/system.api.php +++ b/docroot/core/modules/system/system.api.php @@ -2878,9 +2878,16 @@ function hook_install() { * name, you should never renumber update functions. It may result in updates * being either skipped or run twice. * - * Not all module functions are available from within a hook_update_N() function. - * In order to call a function from your mymodule.module or an include file, - * you need to explicitly load that file first. + * Module functions not in the install file cannot be counted on to be available + * from within a hook_update_N() function. In order to call a function from your + * mymodule.module or an include file, you need to explicitly load that file + * first. + * + * This is because if a module was previously enabled but is now disabled (and + * has not been uninstalled), update hooks will still be called for that module + * during system updates, but the mymodule.module file (and any other files + * loaded by that one, including, for example, autoload information) will not + * have been loaded. * * During database updates the schema of any module could be out of date. For * this reason, caution is needed when using any API function within an update @@ -2902,9 +2909,9 @@ function hook_install() { * Stores information for multipass updates. See above for more information. * * @throws BackdropUpdateException, PDOException - * In case of error, update hooks should throw an instance of BackdropUpdateException - * with a meaningful message for the user. If a database query fails for whatever - * reason, it will throw a PDOException. + * In case of error, update hooks should throw an instance of + * BackdropUpdateException with a meaningful message for the user. If a + * database query fails for whatever reason, it will throw a PDOException. * * @return * Optionally, update hooks may return a translated string that will be diff --git a/docroot/core/modules/system/system.info b/docroot/core/modules/system/system.info index 74656e0c..67088e05 100644 --- a/docroot/core/modules/system/system.info +++ b/docroot/core/modules/system/system.info @@ -8,7 +8,7 @@ required = TRUE configure = admin/config/system -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info b/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info index 1d31c3b8..7f1130c4 100644 --- a/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info +++ b/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info b/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info index 57140e71..a95efbc6 100644 --- a/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info +++ b/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/system/tests/system.tests.info b/docroot/core/modules/system/tests/system.tests.info index 4e21cc4d..275b5a21 100644 --- a/docroot/core/modules/system/tests/system.tests.info +++ b/docroot/core/modules/system/tests/system.tests.info @@ -215,7 +215,7 @@ description = Tests limiting menu block level and depth. group = System file = system.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info b/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info index 3c3e0d47..38bdada4 100644 --- a/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info +++ b/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info @@ -6,7 +6,7 @@ version = VERSION backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/taxonomy/taxonomy.info b/docroot/core/modules/taxonomy/taxonomy.info index 44386c8e..727ada64 100644 --- a/docroot/core/modules/taxonomy/taxonomy.info +++ b/docroot/core/modules/taxonomy/taxonomy.info @@ -11,7 +11,7 @@ dependencies[] = entity configure = admin/structure/taxonomy -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/taxonomy/tests/taxonomy.tests.info b/docroot/core/modules/taxonomy/tests/taxonomy.tests.info index 974854f8..5dbf0e6e 100644 --- a/docroot/core/modules/taxonomy/tests/taxonomy.tests.info +++ b/docroot/core/modules/taxonomy/tests/taxonomy.tests.info @@ -101,7 +101,7 @@ group = Taxonomy file = taxonomy_views_handler_relationship_node_term_data.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info b/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info index 82169e4f..d82358b5 100644 --- a/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info +++ b/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info @@ -6,7 +6,7 @@ version = VERSION backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info b/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info index e9af2711..5c7afed5 100644 --- a/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info +++ b/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info @@ -6,7 +6,7 @@ version = VERSION backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/telemetry/telemetry.info b/docroot/core/modules/telemetry/telemetry.info index d14b1e1c..462735cb 100644 --- a/docroot/core/modules/telemetry/telemetry.info +++ b/docroot/core/modules/telemetry/telemetry.info @@ -5,7 +5,7 @@ version = BACKDROP_VERSION type = module backdrop = 1.x -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/telemetry/telemetry.telemetry.inc b/docroot/core/modules/telemetry/telemetry.telemetry.inc index ecf23f90..ea18e15b 100644 --- a/docroot/core/modules/telemetry/telemetry.telemetry.inc +++ b/docroot/core/modules/telemetry/telemetry.telemetry.inc @@ -33,6 +33,11 @@ function telemetry_telemetry_info() { 'description' => t('The profile that was used to install your site.'), 'project' => 'backdrop', ); + $info['multisite'] = array( + 'label' => t('Multisite'), + 'description' => t('Is this Backdrop installation set up as a multisite?'), + 'project' => 'backdrop', + ); return $info; } @@ -62,5 +67,7 @@ function telemetry_telemetry_data($key) { } case 'install_profile': return backdrop_get_profile(); + case 'multisite': + return conf_path() == '.' ? 'No' : 'Yes'; } } diff --git a/docroot/core/modules/translation/tests/translation.tests.info b/docroot/core/modules/translation/tests/translation.tests.info index c17db317..d28d25c7 100644 --- a/docroot/core/modules/translation/tests/translation.tests.info +++ b/docroot/core/modules/translation/tests/translation.tests.info @@ -4,7 +4,7 @@ description = Create a page with translation, modify the page outdating translat group = Translation file = translation.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/translation/tests/translation_test/translation_test.info b/docroot/core/modules/translation/tests/translation_test/translation_test.info index c0d2bad7..ba061041 100644 --- a/docroot/core/modules/translation/tests/translation_test/translation_test.info +++ b/docroot/core/modules/translation/tests/translation_test/translation_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION type = module hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/translation/translation.info b/docroot/core/modules/translation/translation.info index 3634a26c..722bd0c3 100644 --- a/docroot/core/modules/translation/translation.info +++ b/docroot/core/modules/translation/translation.info @@ -7,7 +7,7 @@ tags[] = Language version = BACKDROP_VERSION backdrop = 1.x -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info b/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info index b8481166..bb51bb09 100644 --- a/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info +++ b/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info b/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info index e6372a20..c18a3386 100644 --- a/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info +++ b/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info b/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info index 475bab1f..989936a2 100644 --- a/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info +++ b/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info @@ -6,7 +6,7 @@ backdrop = 1.x hidden = TRUE type = module -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/update.tests.info b/docroot/core/modules/update/tests/update.tests.info index 94958662..12f74c67 100644 --- a/docroot/core/modules/update/tests/update.tests.info +++ b/docroot/core/modules/update/tests/update.tests.info @@ -16,7 +16,7 @@ description = Test update functionality unrelated to the database. group = Update file = update.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info b/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info index 6c616f0b..3e41c6d6 100644 --- a/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info +++ b/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info @@ -5,7 +5,7 @@ version = BACKDROP_VERSION backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info b/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info index af24f7ae..a73ae05d 100644 --- a/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info +++ b/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info @@ -5,7 +5,7 @@ version = BACKDROP_VERSION backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info b/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info index 61cb47de..8b8b61c9 100644 --- a/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info +++ b/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info @@ -6,7 +6,7 @@ backdrop = 1.x base theme = update_test_basetheme hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/tests/update_test/update_test.info b/docroot/core/modules/update/tests/update_test/update_test.info index 66f6cc29..2361a5bd 100644 --- a/docroot/core/modules/update/tests/update_test/update_test.info +++ b/docroot/core/modules/update/tests/update_test/update_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/update/update.info b/docroot/core/modules/update/update.info index 2c3743d4..4550fb5b 100644 --- a/docroot/core/modules/update/update.info +++ b/docroot/core/modules/update/update.info @@ -9,7 +9,7 @@ backdrop = 1.x configure = admin/reports/updates/settings -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/user/config/user.flood.json b/docroot/core/modules/user/config/user.flood.json index acbe28d8..15b79140 100644 --- a/docroot/core/modules/user/config/user.flood.json +++ b/docroot/core/modules/user/config/user.flood.json @@ -1,6 +1,6 @@ { "_config_name": "user.flood", - "flood_uid_only": "false", + "flood_uid_only": "0", "flood_ip_limit": 50, "flood_ip_window": 3600, "flood_log_failed_attempts": 1, diff --git a/docroot/core/modules/user/tests/user.tests.info b/docroot/core/modules/user/tests/user.tests.info index 02ddaab4..b42773c1 100644 --- a/docroot/core/modules/user/tests/user.tests.info +++ b/docroot/core/modules/user/tests/user.tests.info @@ -178,7 +178,7 @@ description = Tests the basic integration with Views module. group = User file = user_views.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info b/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info index 3df17da9..bc5ba26a 100644 --- a/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info +++ b/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/user/tests/user_form_test/user_form_test.info b/docroot/core/modules/user/tests/user_form_test/user_form_test.info index 897dbd93..ac2f191c 100644 --- a/docroot/core/modules/user/tests/user_form_test/user_form_test.info +++ b/docroot/core/modules/user/tests/user_form_test/user_form_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/user/tests/user_session_test/user_session_test.info b/docroot/core/modules/user/tests/user_session_test/user_session_test.info index 22595bcc..abe68d7d 100644 --- a/docroot/core/modules/user/tests/user_session_test/user_session_test.info +++ b/docroot/core/modules/user/tests/user_session_test/user_session_test.info @@ -6,7 +6,7 @@ type = module backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/user/user.admin.inc b/docroot/core/modules/user/user.admin.inc index e6aa4ef7..4e77b305 100644 --- a/docroot/core/modules/user/user.admin.inc +++ b/docroot/core/modules/user/user.admin.inc @@ -380,15 +380,15 @@ function user_login_settings($form, &$form_state) { '#type' => 'radios', '#title' => t('Identify users attempting to log in, using'), '#options' => array( - '0' => t('User ID and IP address combination'), '1' => t('User ID only'), + '0' => t('User ID and IP address combination'), ), '#default_value' => $flood_config->get('flood_uid_only'), - FALSE => array( - '#description' => ' Less secure, less likely to lock out users.', + '1' => array( + '#description' => t('More secure, more likely to lock out users.'), ), - TRUE => array( - '#description' => 'More secure, more likely to lock out users.', + '0' => array( + '#description' => t('Less secure, less likely to lock out users.'), ), ); diff --git a/docroot/core/modules/user/user.info b/docroot/core/modules/user/user.info index afcd7f3f..978ded0c 100644 --- a/docroot/core/modules/user/user.info +++ b/docroot/core/modules/user/user.info @@ -11,7 +11,7 @@ configure = admin/config/people stylesheets[all][] = css/user.css -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/user/user.install b/docroot/core/modules/user/user.install index cb3c3ffe..f0074385 100644 --- a/docroot/core/modules/user/user.install +++ b/docroot/core/modules/user/user.install @@ -2357,6 +2357,19 @@ function user_update_1025() { $config->save(); } +/** + * Correct the default config value for the "flood_uid_only" setting. + */ +function user_update_1026() { + $config = config('user.flood'); + + // Only update if the value is exactly the string "false". + if ($config->get('flood_uid_only') === 'false') { + $config->set('flood_uid_only', '0'); + $config->save(); + } +} + /** * @} End of "addtogroup updates-7.x-to-1.x" */ diff --git a/docroot/core/modules/user/views/views_handler_filter_user_name.inc b/docroot/core/modules/user/views/views_handler_filter_user_name.inc index e3fabc2c..a223a13c 100644 --- a/docroot/core/modules/user/views/views_handler_filter_user_name.inc +++ b/docroot/core/modules/user/views/views_handler_filter_user_name.inc @@ -31,7 +31,6 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator { $form['value'] = array( '#type' => 'textfield', '#title' => t('Usernames'), - '#description' => t('Enter a comma separated list of user names.'), '#default_value' => $default_value, '#autocomplete_path' => 'admin/views/ajax/autocomplete/user', ); @@ -39,6 +38,9 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator { if (!empty($form_state['exposed']) && !isset($form_state['input'][$this->options['expose']['identifier']])) { $form_state['input'][$this->options['expose']['identifier']] = $default_value; } + if (empty($form_state['exposed'])) { + $form['value']['#description'] = t('Enter a comma separated list of user names.'); + } } function value_validate($form, &$form_state) { diff --git a/docroot/core/modules/views/handlers/views_handler_field.inc b/docroot/core/modules/views/handlers/views_handler_field.inc index 3539465d..36429cee 100644 --- a/docroot/core/modules/views/handlers/views_handler_field.inc +++ b/docroot/core/modules/views/handlers/views_handler_field.inc @@ -1195,7 +1195,7 @@ If you would like to have the characters \'[\' and \']\' please use the html ent $value = $this->render_altered($alter, $tokens); } - if (!empty($this->options['alter']['trim_whitespace'])) { + if (!is_null($value) && !empty($this->options['alter']['trim_whitespace'])) { $value = trim($value); } diff --git a/docroot/core/modules/views/tests/views.tests.info b/docroot/core/modules/views/tests/views.tests.info index 827d0e1f..4c1e8ff6 100644 --- a/docroot/core/modules/views/tests/views.tests.info +++ b/docroot/core/modules/views/tests/views.tests.info @@ -346,7 +346,7 @@ description = Tests some functionality of the view class. group = Views file = views_view.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/views/tests/views_test/views_test.info b/docroot/core/modules/views/tests/views_test/views_test.info index 93db5ad3..3c38137c 100644 --- a/docroot/core/modules/views/tests/views_test/views_test.info +++ b/docroot/core/modules/views/tests/views_test/views_test.info @@ -7,7 +7,7 @@ backdrop = 1.x dependencies[] = views hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info b/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info index 3886723d..dd589cee 100644 --- a/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info +++ b/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info @@ -7,7 +7,7 @@ backdrop = 1.x dependencies[] = views hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/views/views.info b/docroot/core/modules/views/views.info index af0437bc..11be5c4f 100644 --- a/docroot/core/modules/views/views.info +++ b/docroot/core/modules/views/views.info @@ -8,7 +8,7 @@ backdrop = 1.x stylesheets[all][] = css/views.css required = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/modules/views_ui/views_ui.info b/docroot/core/modules/views_ui/views_ui.info index 92945f5a..cecb2ecc 100644 --- a/docroot/core/modules/views_ui/views_ui.info +++ b/docroot/core/modules/views_ui/views_ui.info @@ -10,7 +10,7 @@ dependencies[] = views configure = admin/structure/views -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/profiles/minimal/minimal.info b/docroot/core/profiles/minimal/minimal.info index 8a48fe9b..34a20250 100644 --- a/docroot/core/profiles/minimal/minimal.info +++ b/docroot/core/profiles/minimal/minimal.info @@ -9,7 +9,7 @@ dependencies[] = node dependencies[] = dblog dependencies[] = layout -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/profiles/standard/standard.info b/docroot/core/profiles/standard/standard.info index 746c7ddf..d64d0b9d 100644 --- a/docroot/core/profiles/standard/standard.info +++ b/docroot/core/profiles/standard/standard.info @@ -35,7 +35,7 @@ dependencies[] = update dependencies[] = views dependencies[] = views_ui -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info index 136bcfcc..e9fb512b 100644 --- a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info +++ b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info @@ -6,7 +6,7 @@ version = BACKDROP_VERSION backdrop = 1.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info index 48c2e91a..5ae7f97d 100644 --- a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info +++ b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info @@ -4,7 +4,7 @@ description = Verifies that tests in installation profile modules are found and group = Installation profiles file = backdrop_system_listing_compatible_test.test -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info b/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info index 881a6932..d2b42842 100644 --- a/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info +++ b/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info @@ -9,7 +9,7 @@ type = module backdrop = 0.x hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/profiles/testing/testing.info b/docroot/core/profiles/testing/testing.info index 5864d312..42f4b9f9 100644 --- a/docroot/core/profiles/testing/testing.info +++ b/docroot/core/profiles/testing/testing.info @@ -7,7 +7,7 @@ hidden = TRUE dependencies[] = layout -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/themes/bartik/bartik.info b/docroot/core/themes/bartik/bartik.info index d210d06d..220bb620 100644 --- a/docroot/core/themes/bartik/bartik.info +++ b/docroot/core/themes/bartik/bartik.info @@ -16,7 +16,7 @@ ckeditor_stylesheets[] = css/editor.css settings[color] = true settings[main_menu_tabs] = no-tabs -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/themes/bartik/css/style.css b/docroot/core/themes/bartik/css/style.css index 5b98eb70..e8fa6428 100644 --- a/docroot/core/themes/bartik/css/style.css +++ b/docroot/core/themes/bartik/css/style.css @@ -679,6 +679,32 @@ ul.tips { background: none; } +/* --------------- Hierarchical Tree Menu ------------ */ + +.menu-tree > li > ul { + background: rgba(255, 255, 255, 0.8); +} +.menu-tree > li.has-children > ul li a, +.menu-tree > li.has-children > ul li li a { + background: transparent; + display: block; +} + +.menu-tree > li.has-children > ul li li a { + padding-left: 30px; +} +.menu-tree > li.has-children > ul li li li a { + padding-left: 45px; +} +.menu-tree > li.has-children > ul li a.active, +.menu-tree > li.has-children > ul li li a.active { + background: #fff; +} + +ul.menu-tree > li.has-children > a { + display: inline-block; +} + /* ------------------- Main ------------------- */ .l-container { @@ -1340,6 +1366,7 @@ fieldset { } .filter-wrapper { padding: .5em 0; + margin: 0 0 32px 0; } .filter-wrapper legend, .filter-wrapper.collapsed legend { @@ -1348,6 +1375,7 @@ fieldset { border-top-left-radius: 0; border-top-right-radius: 0; border-top: none; + box-sizing: content-box; } .filter-wrapper .form-item label { margin-right: 10px; diff --git a/docroot/core/themes/basis/basis.info b/docroot/core/themes/basis/basis.info index 75399c2b..9d733f08 100644 --- a/docroot/core/themes/basis/basis.info +++ b/docroot/core/themes/basis/basis.info @@ -46,7 +46,7 @@ scripts[] = js/script.js ; menu. Color module provides our defaults, so we just register a dummy setting. settings[color] = true -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/themes/seven/css/style.css b/docroot/core/themes/seven/css/style.css index 59bf6adc..210d76b4 100644 --- a/docroot/core/themes/seven/css/style.css +++ b/docroot/core/themes/seven/css/style.css @@ -953,6 +953,9 @@ div.description, font-size: 0.923em; color: #666; } +div.description.form-item-description { + margin: -1em 0 1em 0; +} .password-strength { padding-top: 6px; } diff --git a/docroot/core/themes/seven/seven.info b/docroot/core/themes/seven/seven.info index f70a01d6..e9291cbb 100644 --- a/docroot/core/themes/seven/seven.info +++ b/docroot/core/themes/seven/seven.info @@ -12,7 +12,7 @@ ckeditor_stylesheets[] = css/seven.base.css scripts[] = js/script.js -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719 diff --git a/docroot/core/themes/stark/stark.info b/docroot/core/themes/stark/stark.info index 325b65d4..184999f8 100644 --- a/docroot/core/themes/stark/stark.info +++ b/docroot/core/themes/stark/stark.info @@ -8,7 +8,7 @@ stylesheets[all][] = layout.css ; Hides this theme from the Appearance page hidden = TRUE -; Added by Backdrop CMS packaging script on 2023-09-15 +; Added by Backdrop CMS packaging script on 2023-10-06 project = backdrop -version = 1.26.0 -timestamp = 1694823391 +version = 1.26.1 +timestamp = 1696627719