diff --git a/coverage/.gitignore b/coverage/.gitignore deleted file mode 100644 index 08fe25b560..0000000000 --- a/coverage/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -diff.txt -phpcs.json diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 6891f12773..8b05bc5c68 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.63'); +define('VERSION', '7.67'); /** * Core API compatibility. diff --git a/includes/common.inc b/includes/common.inc index 38aef76cdf..44ff460787 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1094,6 +1094,11 @@ function drupal_http_request($url, array $options = array()) { elseif ($options['max_redirects']) { // Redirect to the new location. $options['max_redirects']--; + + // We need to unset the 'Host' header + // as we are redirecting to a new location. + unset($options['headers']['Host']); + $result = drupal_http_request($location, $options); $result->redirect_code = $code; } @@ -5539,11 +5544,6 @@ function drupal_cron_cleanup() { * - 'name': Name of file without the extension. */ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) { - $cid = "drupal_system_listing|$mask|$directory|$key|$min_depth"; - $cache = cache_get($cid); - if(!empty($cache->data)){ - return $cache->data; - } $config = conf_path(); $searchdir = array($directory); @@ -5611,7 +5611,7 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) } $files = array_merge($files, $files_to_add); } - cache_set($cid, $files, 'cache', time() + 604800); + return $files; } @@ -7487,18 +7487,12 @@ function drupal_parse_info_file($filename) { $info = &drupal_static(__FUNCTION__, array()); if (!isset($info[$filename])) { - $cache = cache_get(__FUNCTION__); - if(empty($cache->data) || empty($cache->data[$filename])){ - if (!file_exists($filename)) { - $info[$filename] = array(); - } - else { - $data = file_get_contents($filename); - $info[$filename] = drupal_parse_info_format($data); - } - cache_set(__FUNCTION__, $info, 'cache', time() + 604800); - } else { - $info = $cache->data; + if (!file_exists($filename)) { + $info[$filename] = array(); + } + else { + $data = file_get_contents($filename); + $info[$filename] = drupal_parse_info_format($data); } } return $info[$filename]; @@ -7845,7 +7839,7 @@ function drupal_check_incompatibility($v, $current_version) { * @see hook_entity_info() * @see hook_entity_info_alter() */ -function entity_get_info($entity_type = NULL, $reset = FALSE) { +function entity_get_info($entity_type = NULL) { global $language; // Use the advanced drupal_static() pattern, since this is called very often. @@ -7853,9 +7847,6 @@ function entity_get_info($entity_type = NULL, $reset = FALSE) { if (!isset($drupal_static_fast)) { $drupal_static_fast['entity_info'] = &drupal_static(__FUNCTION__); } - if($reset){ - $drupal_static_fast = NULL; - } $entity_info = &$drupal_static_fast['entity_info']; // hook_entity_info() includes translated strings, so each language is cached diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index dd14e0cd31..9ba1c73397 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -101,8 +101,6 @@ class DatabaseSchema_mysql extends DatabaseSchema { // Remove the last comma and space. $sql = substr($sql, 0, -3) . "\n) "; - $sql .= 'ROW_FORMAT=DYNAMIC '; - $sql .= 'ENGINE = ' . $table['mysql_engine'] . ' DEFAULT CHARACTER SET ' . $table['mysql_character_set']; // By default, MySQL uses the default collation for new tables, which is // 'utf8_general_ci' for utf8. If an alternate collation has been set, it diff --git a/includes/file.inc b/includes/file.inc index 8ab5f01b5e..95bb658432 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -611,9 +611,7 @@ function file_load($fid) { */ function file_save(stdClass $file) { $file->timestamp = REQUEST_TIME; - if(empty($file->filesize) || (function_exists('file_entity_file_is_local') && file_entity_file_is_local($file))){ - $file->filesize = filesize($file->uri); - } + $file->filesize = filesize($file->uri); // Load the stored entity, if any. if (!empty($file->fid) && !isset($file->original)) { @@ -995,8 +993,15 @@ function file_build_uri($path) { * @return * The destination filepath, or FALSE if the file already exists * and FILE_EXISTS_ERROR is specified. + * + * @throws RuntimeException + * Thrown if the filename contains invalid UTF-8. */ function file_destination($destination, $replace) { + $basename = drupal_basename($destination); + if (!drupal_validate_utf8($basename)) { + throw new RuntimeException(sprintf("Invalid filename '%s'", $basename)); + } if (file_exists($destination)) { switch ($replace) { case FILE_EXISTS_REPLACE: @@ -1004,7 +1009,6 @@ function file_destination($destination, $replace) { break; case FILE_EXISTS_RENAME: - $basename = drupal_basename($destination); $directory = drupal_dirname($destination); $destination = file_create_filename($basename, $directory); break; @@ -1220,11 +1224,20 @@ function file_unmunge_filename($filename) { * @return * File path consisting of $directory and a unique filename based off * of $basename. + * + * @throws RuntimeException + * Thrown if the $basename is not valid UTF-8 or another error occurs + * stripping control characters. */ function file_create_filename($basename, $directory) { + $original = $basename; // Strip control characters (ASCII value < 32). Though these are allowed in // some filesystems, not many applications handle them well. $basename = preg_replace('/[\x00-\x1F]/u', '_', $basename); + if (preg_last_error() !== PREG_NO_ERROR) { + throw new RuntimeException(sprintf("Invalid filename '%s'", $original)); + } + if (substr(PHP_OS, 0, 3) == 'WIN') { // These characters are not allowed in Windows filenames $basename = str_replace(array(':', '*', '?', '"', '<', '>', '|'), '_', $basename); @@ -1565,7 +1578,13 @@ function file_save_upload($form_field_name, $validators = array(), $destination if (substr($destination, -1) != '/') { $destination .= '/'; } - $file->destination = file_destination($destination . $file->filename, $replace); + try { + $file->destination = file_destination($destination . $file->filename, $replace); + } + catch (RuntimeException $e) { + drupal_set_message(t('The file %source could not be uploaded because the name is invalid.', array('%source' => $form_field_name)), 'error'); + return FALSE; + } // If file_destination() returns FALSE then $replace == FILE_EXISTS_ERROR and // there's an existing file so we need to bail. if ($file->destination === FALSE) { @@ -2132,9 +2151,33 @@ function file_download_access($uri) { * 'filename', and 'name' members corresponding to the matching files. */ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) { + // Default nomask option. + $nomask = '/(\.\.?|CVS)$/'; + + // Overrides the $nomask variable accordingly if $options['nomask'] is set. + // + // Allow directories specified in settings.php to be ignored. You can use this + // to not check for files in common special-purpose directories. For example, + // node_modules and bower_components. Ignoring irrelevant directories is a + // performance boost. + if (!isset($options['nomask'])) { + $ignore_directories = variable_get( + 'file_scan_ignore_directories', + array() + ); + + foreach ($ignore_directories as $index => $ignore_directory) { + $ignore_directories[$index] = preg_quote($ignore_directory, '/'); + } + + if (!empty($ignore_directories)) { + $nomask = '/^(\.\.?)|CVS|' . implode('|', $ignore_directories) . '$/'; + } + } + // Merge in defaults. $options += array( - 'nomask' => '/(\.\.?|CVS)$/', + 'nomask' => $nomask, 'callback' => 0, 'recurse' => TRUE, 'key' => 'uri', diff --git a/includes/file.phar.inc b/includes/file.phar.inc index 3d7ba01d4d..a0b0e12faf 100644 --- a/includes/file.phar.inc +++ b/includes/file.phar.inc @@ -18,7 +18,21 @@ function file_register_phar_wrapper() { include_once $directory . '/Helper.php'; include_once $directory . '/Manager.php'; include_once $directory . '/PharStreamWrapper.php'; + include_once $directory . '/Collectable.php'; + include_once $directory . '/Interceptor/ConjunctionInterceptor.php'; + include_once $directory . '/Interceptor/PharMetaDataInterceptor.php'; + include_once $directory . '/Phar/Container.php'; + include_once $directory . '/Phar/DeserializationException.php'; + include_once $directory . '/Phar/Manifest.php'; + include_once $directory . '/Phar/Reader.php'; + include_once $directory . '/Phar/ReaderException.php'; + include_once $directory . '/Phar/Stub.php'; + include_once $directory . '/Resolvable.php'; + include_once $directory . '/Resolver/PharInvocation.php'; + include_once $directory . '/Resolver/PharInvocationCollection.php'; + include_once $directory . '/Resolver/PharInvocationResolver.php'; include_once DRUPAL_ROOT . '/misc/typo3/drupal-security/PharExtensionInterceptor.php'; + include_once DRUPAL_ROOT . '/misc/brumann/polyfill-unserialize/src/Unserialize.php'; // Set up a stream wrapper to handle insecurities due to PHP's built-in // phar stream wrapper. diff --git a/includes/registry.inc b/includes/registry.inc index 29a1fca8cc..ee678e891b 100644 --- a/includes/registry.inc +++ b/includes/registry.inc @@ -19,7 +19,6 @@ * Does the work for registry_update(). */ function _registry_update() { - // The registry serves as a central autoloader for all classes, including // the database query builders. However, the registry rebuild process // requires write ability to the database, which means having access to the @@ -33,6 +32,11 @@ function _registry_update() { require_once DRUPAL_ROOT . '/includes/database/select.inc'; require_once DRUPAL_ROOT . '/includes/database/' . $driver . '/query.inc'; + // During the first registry rebuild in a request, we check all the files. + // During subsequent rebuilds, we only add new files. It makes the rebuilding + // process faster during installation of modules. + static $check_existing_files = TRUE; + // Get current list of modules and their files. $modules = db_query("SELECT * FROM {system} WHERE type = 'module'")->fetchAll(); // Get the list of files we are going to parse. @@ -55,6 +59,9 @@ function _registry_update() { $files["$filename"] = array('module' => '', 'weight' => 0); } + // Initialize an empty array for the unchanged files. + $unchanged_files = array(); + $transaction = db_transaction(); try { // Allow modules to manually modify the list of files before the registry @@ -63,10 +70,19 @@ function _registry_update() { // list can then be added to the list of files that the registry will parse, // or modify attributes of a file. drupal_alter('registry_files', $files, $modules); + foreach (registry_get_parsed_files() as $filename => $file) { // Add the hash for those files we have already parsed. if (isset($files[$filename])) { - $files[$filename]['hash'] = $file['hash']; + if ($check_existing_files === TRUE) { + $files[$filename]['hash'] = $file['hash']; + } + else { + // Ignore that file for this request, it has been parsed previously + // and it is unlikely it has changed. + unset($files[$filename]); + $unchanged_files[$filename] = $file; + } } else { // Flush the registry of resources in files that are no longer on disc @@ -79,8 +95,12 @@ function _registry_update() { ->execute(); } } + $parsed_files = _registry_parse_files($files); + // Add unchanged files to the files. + $files += $unchanged_files; + $unchanged_resources = array(); $lookup_cache = array(); if ($cache = cache_get('lookup_cache', 'cache_bootstrap')) { @@ -89,12 +109,10 @@ function _registry_update() { foreach ($lookup_cache as $key => $file) { // If the file for this cached resource is carried over unchanged from // the last registry build, then we can safely re-cache it. - if ($file && in_array($file, array_keys($files)) && !in_array($file, $parsed_files)) { + if ($file && isset($files[$file]) && !in_array($file, $parsed_files, TRUE)) { $unchanged_resources[$key] = $file; } } - module_implements('', FALSE, TRUE); - _registry_check_code(REGISTRY_RESET_LOOKUP_CACHE); } catch (Exception $e) { $transaction->rollback(); @@ -102,6 +120,13 @@ function _registry_update() { throw $e; } + module_implements('', FALSE, TRUE); + _registry_check_code(REGISTRY_RESET_LOOKUP_CACHE); + + // During the next run in this request, don't bother re-checking existing + // files. + $check_existing_files = FALSE; + // We have some unchanged resources, warm up the cache - no need to pay // for looking them up again. if (count($unchanged_resources) > 0) { diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info index a5532dc2fa..d96edbdbf3 100644 --- a/modules/aggregator/aggregator.info +++ b/modules/aggregator/aggregator.info @@ -7,7 +7,7 @@ files[] = aggregator.test configure = admin/config/services/aggregator/settings stylesheets[all][] = aggregator.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info index 90a8b2f63b..e0253ce911 100644 --- a/modules/aggregator/tests/aggregator_test.info +++ b/modules/aggregator/tests/aggregator_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/block/block.info b/modules/block/block.info index c9c4171ec1..8fccc4881d 100644 --- a/modules/block/block.info +++ b/modules/block/block.info @@ -6,7 +6,7 @@ core = 7.x files[] = block.test configure = admin/structure/block -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info index beb9141a08..dbd4862618 100644 --- a/modules/block/tests/block_test.info +++ b/modules/block/tests/block_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info index 89305fc0e4..9fe95fa66c 100644 --- a/modules/block/tests/themes/block_test_theme/block_test_theme.info +++ b/modules/block/tests/themes/block_test_theme/block_test_theme.info @@ -13,7 +13,7 @@ regions[footer] = Footer regions[highlighted] = Highlighted regions[help] = Help -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/blog/blog.info b/modules/blog/blog.info index 041aadcfef..aade484942 100644 --- a/modules/blog/blog.info +++ b/modules/blog/blog.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = blog.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/book/book.info b/modules/book/book.info index a3c5af7eb7..95054e4610 100644 --- a/modules/book/book.info +++ b/modules/book/book.info @@ -7,7 +7,7 @@ files[] = book.test configure = admin/content/book/settings stylesheets[all][] = book.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/color/color.info b/modules/color/color.info index 2f986d902a..764e249442 100644 --- a/modules/color/color.info +++ b/modules/color/color.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = color.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/comment/comment.info b/modules/comment/comment.info index 7970128c76..8cf5f16735 100644 --- a/modules/comment/comment.info +++ b/modules/comment/comment.info @@ -9,7 +9,7 @@ files[] = comment.test configure = admin/content/comment stylesheets[all][] = comment.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/contact/contact.info b/modules/contact/contact.info index 663818e1e8..b7c403c8cd 100644 --- a/modules/contact/contact.info +++ b/modules/contact/contact.info @@ -6,7 +6,7 @@ core = 7.x files[] = contact.test configure = admin/structure/contact -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info index d23cc9a816..17a83bd3e4 100644 --- a/modules/contextual/contextual.info +++ b/modules/contextual/contextual.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = contextual.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info index d3ca721629..4fc749d3c5 100644 --- a/modules/dashboard/dashboard.info +++ b/modules/dashboard/dashboard.info @@ -7,7 +7,7 @@ files[] = dashboard.test dependencies[] = block configure = admin/dashboard/customize -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info index 26e1737103..cbc892687e 100644 --- a/modules/dblog/dblog.info +++ b/modules/dblog/dblog.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = dblog.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/field.info b/modules/field/field.info index 2228c05911..5a60e62aee 100644 --- a/modules/field/field.info +++ b/modules/field/field.info @@ -11,7 +11,7 @@ dependencies[] = field_sql_storage required = TRUE stylesheets[all][] = theme/field.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info index e43fe820f1..ecf448ea69 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.info +++ b/modules/field/modules/field_sql_storage/field_sql_storage.info @@ -7,7 +7,7 @@ dependencies[] = field files[] = field_sql_storage.test required = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info index 851292eb00..433bb72f80 100644 --- a/modules/field/modules/list/list.info +++ b/modules/field/modules/list/list.info @@ -7,7 +7,7 @@ dependencies[] = field dependencies[] = options files[] = tests/list.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info index 9a8e792ec0..f1a2511793 100644 --- a/modules/field/modules/list/tests/list_test.info +++ b/modules/field/modules/list/tests/list_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info index a7853d5952..18b595b1a2 100644 --- a/modules/field/modules/number/number.info +++ b/modules/field/modules/number/number.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = number.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/modules/number/number.test b/modules/field/modules/number/number.test index 839da36c37..db225855bf 100644 --- a/modules/field/modules/number/number.test +++ b/modules/field/modules/number/number.test @@ -69,7 +69,7 @@ class NumberFieldTestCase extends DrupalWebTestCase { preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $this->assertRaw(round($value, 2), 'Value is displayed.'); + $this->assertRaw($value, 'Value is displayed.'); // Try to create entries with more than one decimal separator; assert fail. $wrong_entries = array( diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info index 77b1359f8a..b55064304b 100644 --- a/modules/field/modules/options/options.info +++ b/modules/field/modules/options/options.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = options.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info index 39881eb18a..1627800bc4 100644 --- a/modules/field/modules/text/text.info +++ b/modules/field/modules/text/text.info @@ -7,7 +7,7 @@ dependencies[] = field files[] = text.test required = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info index e0f42e987d..a74f7b1d3e 100644 --- a/modules/field/tests/field_test.info +++ b/modules/field/tests/field_test.info @@ -6,7 +6,7 @@ files[] = field_test.entity.inc version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info index d7564f5a41..b44f1c96a9 100644 --- a/modules/field_ui/field_ui.info +++ b/modules/field_ui/field_ui.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = field_ui.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc index d592381bd5..fc1a1df200 100644 --- a/modules/file/file.field.inc +++ b/modules/file/file.field.inc @@ -599,7 +599,7 @@ function file_field_widget_value($element, $input = FALSE, $form_state) { // If the display field is present make sure its unchecked value is saved. $field = field_widget_field($element, $form_state); if (empty($input['display'])) { - $input['display'] = $field['settings']['display_field'] ? 0 : 1; + $input['display'] = !empty($field['settings']['display_field']) ? 0 : 1; } } diff --git a/modules/file/file.info b/modules/file/file.info index f2d0872fdf..220bae2ae8 100644 --- a/modules/file/file.info +++ b/modules/file/file.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = tests/file.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test index f764a90332..849451a558 100644 --- a/modules/file/tests/file.test +++ b/modules/file/tests/file.test @@ -1875,3 +1875,60 @@ class FileFieldAnonymousSubmission extends FileFieldTestCase { } } + +/** + * Tests the file_scan_directory() function. + */ +class FileScanDirectory extends FileFieldTestCase { + + /** + * @var string + */ + protected $path; + + /** + * {@inheritdoc} + */ + public static function getInfo() { + return array( + 'name' => 'File ScanDirectory', + 'description' => 'Tests the file_scan_directory() function.', + 'group' => 'File', + ); + } + + /** + * {@inheritdoc} + */ + function setUp() { + parent::setUp(); + + $this->path = 'modules/file/tests/fixtures/file_scan_ignore'; + } + + /** + * Tests file_scan_directory() obeys 'file_scan_ignore_directories' setting. + * If nomask is not passed as argument, it should use the default settings. + * If nomask is passed as argument, it should obey this rule. + */ + public function testNoMask() { + $files = file_scan_directory($this->path, '/\.txt$/'); + $this->assertEqual(3, count($files), '3 text files found when not ignoring directories.'); + + global $conf; + $conf['file_scan_ignore_directories'] = array('frontend_framework'); + + $files = file_scan_directory($this->path, '/\.txt$/'); + $this->assertEqual(1, count($files), '1 text files found when ignoring directories called "frontend_framework".'); + + // Make that directories specified by default still work when a new nomask is provided. + $files = file_scan_directory($this->path, '/\.txt$/', array('nomask' => '/^c.txt/')); + $this->assertEqual(2, count($files), '2 text files found when an "nomask" option is passed in.'); + + // Ensure that the directories in file_scan_ignore_directories are escaped using preg_quote. + $conf['file_scan_ignore_directories'] = array('frontend.*'); + $files = file_scan_directory($this->path, '/\.txt$/'); + $this->assertEqual(3, count($files), '2 text files found when ignoring a directory that is not there.'); + } + +} diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info index a8b4acc9db..5bad5c83d2 100644 --- a/modules/file/tests/file_module_test.info +++ b/modules/file/tests/file_module_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/file/tests/fixtures/file_scan_ignore/a.txt b/modules/file/tests/fixtures/file_scan_ignore/a.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/file/tests/fixtures/file_scan_ignore/frontend_framework/b.txt b/modules/file/tests/fixtures/file_scan_ignore/frontend_framework/b.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/file/tests/fixtures/file_scan_ignore/frontend_framework/c.txt b/modules/file/tests/fixtures/file_scan_ignore/frontend_framework/c.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/filter/filter.info b/modules/filter/filter.info index f16777f816..3133b03a92 100644 --- a/modules/filter/filter.info +++ b/modules/filter/filter.info @@ -7,7 +7,7 @@ files[] = filter.test required = TRUE configure = admin/config/content/formats -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/forum/forum.info b/modules/forum/forum.info index 758f35b238..d389c244ae 100644 --- a/modules/forum/forum.info +++ b/modules/forum/forum.info @@ -9,7 +9,7 @@ files[] = forum.test configure = admin/structure/forum stylesheets[all][] = forum.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/help/help.info b/modules/help/help.info index 46ee825cdd..18f1cd3420 100644 --- a/modules/help/help.info +++ b/modules/help/help.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = help.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/image/image.info b/modules/image/image.info index 7903f2c258..b2940584d5 100644 --- a/modules/image/image.info +++ b/modules/image/image.info @@ -7,7 +7,7 @@ dependencies[] = file files[] = image.test configure = admin/config/media/image-styles -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info index 124b6996bb..57d065efb8 100644 --- a/modules/image/tests/image_module_test.info +++ b/modules/image/tests/image_module_test.info @@ -6,7 +6,7 @@ core = 7.x files[] = image_module_test.module hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/locale/locale.info b/modules/locale/locale.info index fb257d1aaf..f295d88909 100644 --- a/modules/locale/locale.info +++ b/modules/locale/locale.info @@ -6,7 +6,7 @@ core = 7.x files[] = locale.test configure = admin/config/regional/language -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info index 5727160f25..15f49ec889 100644 --- a/modules/locale/tests/locale_test.info +++ b/modules/locale/tests/locale_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/menu/menu.info b/modules/menu/menu.info index 52b127b6fb..b24f2966cb 100644 --- a/modules/menu/menu.info +++ b/modules/menu/menu.info @@ -6,7 +6,7 @@ core = 7.x files[] = menu.test configure = admin/structure/menu -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/node/node.info b/modules/node/node.info index 91e5524778..e802aa6822 100644 --- a/modules/node/node.info +++ b/modules/node/node.info @@ -9,7 +9,7 @@ required = TRUE configure = admin/structure/types stylesheets[all][] = node.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/node/node.module b/modules/node/node.module index 7ed505241c..1d88834cd7 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -3454,15 +3454,7 @@ function _node_query_node_access_alter($query, $type) { } // Otherwise attach it to the node query itself. else { - if (empty($tableinfo['join type'])) { - // If we are looking at the main table of the query, apply the - // subquery directly. - $query->exists($subquery); - } else { - // If we are looking at a joined table, add the node access check - // to the join condition. - $tables[$nalias]['condition'] .= ' AND ' . (string)$subquery; - } + $query->exists($subquery); } } } diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info index b4c70c84c9..c78209ad4b 100644 --- a/modules/node/tests/node_access_test.info +++ b/modules/node/tests/node_access_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info index 162dca0e40..c12a8c154f 100644 --- a/modules/node/tests/node_test.info +++ b/modules/node/tests/node_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info index 80032910e9..a23c4c7caa 100644 --- a/modules/node/tests/node_test_exception.info +++ b/modules/node/tests/node_test_exception.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/openid/openid.info b/modules/openid/openid.info index c6b932514a..5e630f9cc0 100644 --- a/modules/openid/openid.info +++ b/modules/openid/openid.info @@ -5,7 +5,7 @@ package = Core core = 7.x files[] = openid.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info index 5f06fc28ea..f7ea5dca36 100644 --- a/modules/openid/tests/openid_test.info +++ b/modules/openid/tests/openid_test.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = openid hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info index d8f9cf62fe..00a167bc53 100644 --- a/modules/overlay/overlay.info +++ b/modules/overlay/overlay.info @@ -4,7 +4,7 @@ package = Core version = VERSION core = 7.x -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/path/path.info b/modules/path/path.info index 1878b27df0..40fb7ea355 100644 --- a/modules/path/path.info +++ b/modules/path/path.info @@ -6,7 +6,7 @@ core = 7.x files[] = path.test configure = admin/config/search/path -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/php/php.info b/modules/php/php.info index 8f64cf09a1..256116e9bd 100644 --- a/modules/php/php.info +++ b/modules/php/php.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = php.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/poll/poll.info b/modules/poll/poll.info index 630ba42a14..7224eadcb9 100644 --- a/modules/poll/poll.info +++ b/modules/poll/poll.info @@ -6,7 +6,7 @@ core = 7.x files[] = poll.test stylesheets[all][] = poll.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/profile/profile.info b/modules/profile/profile.info index 7d1e79147e..907b1b0a83 100644 --- a/modules/profile/profile.info +++ b/modules/profile/profile.info @@ -11,7 +11,7 @@ configure = admin/config/people/profile ; See user_system_info_alter(). hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info index ee1d9c828a..5ae8c6569b 100644 --- a/modules/rdf/rdf.info +++ b/modules/rdf/rdf.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = rdf.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info index 063514f732..c95e12da9e 100644 --- a/modules/rdf/tests/rdf_test.info +++ b/modules/rdf/tests/rdf_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = blog -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/search/search.info b/modules/search/search.info index 4806cb8f3f..5478e5b96e 100644 --- a/modules/search/search.info +++ b/modules/search/search.info @@ -8,7 +8,7 @@ files[] = search.test configure = admin/config/search/settings stylesheets[all][] = search.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info index a16393ff29..bc8e49cd58 100644 --- a/modules/search/tests/search_embedded_form.info +++ b/modules/search/tests/search_embedded_form.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info index 85d76cc174..85e45dfb5c 100644 --- a/modules/search/tests/search_extra_type.info +++ b/modules/search/tests/search_extra_type.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/search/tests/search_node_tags.info b/modules/search/tests/search_node_tags.info index 5f0f84d6c2..a62e6f1cf1 100644 --- a/modules/search/tests/search_node_tags.info +++ b/modules/search/tests/search_node_tags.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info index a8bcc26812..69c95d1b13 100644 --- a/modules/shortcut/shortcut.info +++ b/modules/shortcut/shortcut.info @@ -6,7 +6,7 @@ core = 7.x files[] = shortcut.test configure = admin/config/user-interface/shortcut -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 3124ffe82a..a0872c234a 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -3012,7 +3012,7 @@ protected function assertRaw($raw, $message = '', $group = 'Other') { if (!$message) { $message = t('Raw "@raw" found', array('@raw' => $raw)); } - return $this->assert(strpos($this->drupalGetContent(), $raw) !== FALSE, $message, $group); + return $this->assert(strpos($this->drupalGetContent(), (string) $raw) !== FALSE, $message, $group); } /** @@ -3032,7 +3032,7 @@ protected function assertNoRaw($raw, $message = '', $group = 'Other') { if (!$message) { $message = t('Raw "@raw" not found', array('@raw' => $raw)); } - return $this->assert(strpos($this->drupalGetContent(), $raw) === FALSE, $message, $group); + return $this->assert(strpos($this->drupalGetContent(), (string) $raw) === FALSE, $message, $group); } /** diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info index 7190c67649..783ace4475 100644 --- a/modules/simpletest/simpletest.info +++ b/modules/simpletest/simpletest.info @@ -57,7 +57,7 @@ files[] = tests/upgrade/update.trigger.test files[] = tests/upgrade/update.field.test files[] = tests/upgrade/update.user.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info index a7939735b5..25db0c71a7 100644 --- a/modules/simpletest/tests/actions_loop_test.info +++ b/modules/simpletest/tests/actions_loop_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info index d802f30c33..56e2f1a913 100644 --- a/modules/simpletest/tests/ajax_forms_test.info +++ b/modules/simpletest/tests/ajax_forms_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info index 6ecc1ca0f9..39cf716d9a 100644 --- a/modules/simpletest/tests/ajax_test.info +++ b/modules/simpletest/tests/ajax_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info index 579ca641a6..ef335ad423 100644 --- a/modules/simpletest/tests/batch_test.info +++ b/modules/simpletest/tests/batch_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/boot_test_1.info b/modules/simpletest/tests/boot_test_1.info index b46d19f6b5..139fe8f097 100644 --- a/modules/simpletest/tests/boot_test_1.info +++ b/modules/simpletest/tests/boot_test_1.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/boot_test_2.info b/modules/simpletest/tests/boot_test_2.info index c2d6f8ced2..7e38cc274e 100644 --- a/modules/simpletest/tests/boot_test_2.info +++ b/modules/simpletest/tests/boot_test_2.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test index 16ac1714f6..effd04bf2f 100644 --- a/modules/simpletest/tests/bootstrap.test +++ b/modules/simpletest/tests/bootstrap.test @@ -729,16 +729,12 @@ class BootstrapMiscTestCase extends DrupalUnitTestCase { * Tests that the drupal_check_memory_limit() function works as expected. */ function testCheckMemoryLimit() { - $memory_limit = ini_get('memory_limit'); // Test that a very reasonable amount of memory is available. $this->assertTrue(drupal_check_memory_limit('30MB'), '30MB of memory tested available.'); - // Get the available memory and multiply it by two to make it unreasonably - // high. - $twice_avail_memory = ($memory_limit * 2) . 'MB'; - + // Test an unlimited memory limit. // The function should always return true if the memory limit is set to -1. - $this->assertTrue(drupal_check_memory_limit($twice_avail_memory, -1), 'drupal_check_memory_limit() returns TRUE when a limit of -1 (none) is supplied'); + $this->assertTrue(drupal_check_memory_limit('9999999999YB', -1), 'drupal_check_memory_limit() returns TRUE when a limit of -1 (none) is supplied'); // Test that even though we have 30MB of memory available - the function // returns FALSE when given an upper limit for how much memory can be used. diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info index 21e565d01b..79f8badded 100644 --- a/modules/simpletest/tests/common_test.info +++ b/modules/simpletest/tests/common_test.info @@ -7,7 +7,7 @@ stylesheets[all][] = common_test.css stylesheets[print][] = common_test.print.css hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/common_test_cron_helper.info b/modules/simpletest/tests/common_test_cron_helper.info index cfe45113e7..cf545fa05a 100644 --- a/modules/simpletest/tests/common_test_cron_helper.info +++ b/modules/simpletest/tests/common_test_cron_helper.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info index a882823716..2862e6a608 100644 --- a/modules/simpletest/tests/database_test.info +++ b/modules/simpletest/tests/database_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info index 7664054962..da77216097 100644 --- a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info +++ b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info @@ -7,7 +7,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info index d1f3545e42..a5697a704e 100644 --- a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info +++ b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info index 061a143763..4897bbd2f5 100644 --- a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info +++ b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info index 7f52e24b63..3f7211a6af 100644 --- a/modules/simpletest/tests/entity_cache_test.info +++ b/modules/simpletest/tests/entity_cache_test.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = entity_cache_test_dependency hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info index 5dc9a367d3..8710673f07 100644 --- a/modules/simpletest/tests/entity_cache_test_dependency.info +++ b/modules/simpletest/tests/entity_cache_test_dependency.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info index edc4d5ca48..f2a6b50f88 100644 --- a/modules/simpletest/tests/entity_crud_hook_test.info +++ b/modules/simpletest/tests/entity_crud_hook_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/entity_query_access_test.info b/modules/simpletest/tests/entity_query_access_test.info index 21d13156f0..dd1fd0f0e7 100644 --- a/modules/simpletest/tests/entity_query_access_test.info +++ b/modules/simpletest/tests/entity_query_access_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info index c7fe885eee..40048ccbe6 100644 --- a/modules/simpletest/tests/error_test.info +++ b/modules/simpletest/tests/error_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test index 55dd1906ee..032f2cbac5 100644 --- a/modules/simpletest/tests/file.test +++ b/modules/simpletest/tests/file.test @@ -957,6 +957,15 @@ class FileDirectoryTest extends FileTestCase { $path = file_create_filename($basename, $directory); $this->assertEqual($path, $expected, format_string('Creating a new filepath from %original equals %new.', array('%new' => $path, '%original' => $original)), 'File'); + try { + $filename = "a\xFFtest\x80€.txt"; + file_create_filename($filename, $directory); + $this->fail('Expected exception not thrown'); + } + catch (RuntimeException $e) { + $this->assertEqual("Invalid filename '$filename'", $e->getMessage()); + } + // @TODO: Finally we copy a file into a directory several times, to ensure a properly iterating filename suffix. } @@ -989,6 +998,14 @@ class FileDirectoryTest extends FileTestCase { $this->assertNotEqual($path, $destination, 'A new filepath destination is created when filepath destination already exists with FILE_EXISTS_RENAME.', 'File'); $path = file_destination($destination, FILE_EXISTS_ERROR); $this->assertEqual($path, FALSE, 'An error is returned when filepath destination already exists with FILE_EXISTS_ERROR.', 'File'); + + try { + file_destination("core/misc/a\xFFtest\x80€.txt", FILE_EXISTS_REPLACE); + $this->fail('Expected exception not thrown'); + } + catch (RuntimeException $e) { + $this->assertEqual("Invalid filename 'a\xFFtest\x80€.txt'", $e->getMessage()); + } } /** diff --git a/modules/simpletest/tests/file_test.info b/modules/simpletest/tests/file_test.info index d73960ce74..849fcb3169 100644 --- a/modules/simpletest/tests/file_test.info +++ b/modules/simpletest/tests/file_test.info @@ -6,7 +6,7 @@ core = 7.x files[] = file_test.module hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info index 6433ddd3ab..3b847858b1 100644 --- a/modules/simpletest/tests/filter_test.info +++ b/modules/simpletest/tests/filter_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info index a2657115f8..350ce25956 100644 --- a/modules/simpletest/tests/form_test.info +++ b/modules/simpletest/tests/form_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info index cc14c8f94e..5724949e54 100644 --- a/modules/simpletest/tests/image_test.info +++ b/modules/simpletest/tests/image_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info index c61864d134..717c525803 100644 --- a/modules/simpletest/tests/menu_test.info +++ b/modules/simpletest/tests/menu_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info index bdf17ea1cc..c985a04124 100644 --- a/modules/simpletest/tests/module_test.info +++ b/modules/simpletest/tests/module_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/path_test.info b/modules/simpletest/tests/path_test.info index 4f177d4de5..2590639677 100644 --- a/modules/simpletest/tests/path_test.info +++ b/modules/simpletest/tests/path_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/psr_0_test/psr_0_test.info b/modules/simpletest/tests/psr_0_test/psr_0_test.info index 3d01fab31a..5d83fcb277 100644 --- a/modules/simpletest/tests/psr_0_test/psr_0_test.info +++ b/modules/simpletest/tests/psr_0_test/psr_0_test.info @@ -5,7 +5,7 @@ core = 7.x hidden = TRUE package = Testing -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/psr_4_test/psr_4_test.info b/modules/simpletest/tests/psr_4_test/psr_4_test.info index 0619a2430c..ac574e1517 100644 --- a/modules/simpletest/tests/psr_4_test/psr_4_test.info +++ b/modules/simpletest/tests/psr_4_test/psr_4_test.info @@ -5,7 +5,7 @@ core = 7.x hidden = TRUE package = Testing -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info index 783326cf3a..2901a6badf 100644 --- a/modules/simpletest/tests/requirements1_test.info +++ b/modules/simpletest/tests/requirements1_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info index 8312c3a242..8c03a0cc8e 100644 --- a/modules/simpletest/tests/requirements2_test.info +++ b/modules/simpletest/tests/requirements2_test.info @@ -7,7 +7,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info index 8bf277cfcb..37f3538493 100644 --- a/modules/simpletest/tests/session_test.info +++ b/modules/simpletest/tests/session_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info index 2a82092ac8..de4b981223 100644 --- a/modules/simpletest/tests/system_dependencies_test.info +++ b/modules/simpletest/tests/system_dependencies_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = _missing_dependency -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info index a385a05ac5..e0bd91bd97 100644 --- a/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info +++ b/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = system_incompatible_core_version_test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_incompatible_core_version_test.info b/modules/simpletest/tests/system_incompatible_core_version_test.info index e12847471a..6afe2e4fad 100644 --- a/modules/simpletest/tests/system_incompatible_core_version_test.info +++ b/modules/simpletest/tests/system_incompatible_core_version_test.info @@ -5,7 +5,7 @@ version = VERSION core = 5.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info index 29bd5445c6..a12a356cbd 100644 --- a/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info +++ b/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info @@ -7,7 +7,7 @@ hidden = TRUE ; system_incompatible_module_version_test declares version 1.0 dependencies[] = system_incompatible_module_version_test (>2.0) -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info index 7383a2796c..0281838057 100644 --- a/modules/simpletest/tests/system_incompatible_module_version_test.info +++ b/modules/simpletest/tests/system_incompatible_module_version_test.info @@ -5,7 +5,7 @@ version = 1.0 core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_project_namespace_test.info b/modules/simpletest/tests/system_project_namespace_test.info index 9bc711dc20..136c6b6ad2 100644 --- a/modules/simpletest/tests/system_project_namespace_test.info +++ b/modules/simpletest/tests/system_project_namespace_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = drupal:filter -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/system_test.info b/modules/simpletest/tests/system_test.info index 5e78b89b49..b66b34b8fd 100644 --- a/modules/simpletest/tests/system_test.info +++ b/modules/simpletest/tests/system_test.info @@ -6,7 +6,7 @@ core = 7.x files[] = system_test.module hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info index 59f7142296..09893faa68 100644 --- a/modules/simpletest/tests/taxonomy_test.info +++ b/modules/simpletest/tests/taxonomy_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = taxonomy -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info index c810edcb2f..31faf08cd8 100644 --- a/modules/simpletest/tests/theme_test.info +++ b/modules/simpletest/tests/theme_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info index cab073b5ad..e3cac6c30f 100644 --- a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info +++ b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info @@ -6,7 +6,7 @@ hidden = TRUE settings[basetheme_only] = base theme value settings[subtheme_override] = base theme value -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info index d80c5d0ffd..6287d8ed5e 100644 --- a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info +++ b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info @@ -6,7 +6,7 @@ hidden = TRUE settings[subtheme_override] = subtheme value -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info index a0e0dd68ff..04324c809d 100644 --- a/modules/simpletest/tests/themes/test_theme/test_theme.info +++ b/modules/simpletest/tests/themes/test_theme/test_theme.info @@ -17,7 +17,7 @@ stylesheets[all][] = system.base.css settings[theme_test_setting] = default value -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info b/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info index 49513572fa..2276ea8968 100644 --- a/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info +++ b/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info @@ -4,7 +4,7 @@ core = 7.x hidden = TRUE engine = nyan_cat -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info index ea7b5065f1..839b054e58 100644 --- a/modules/simpletest/tests/update_script_test.info +++ b/modules/simpletest/tests/update_script_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info index 3e3b36f65a..5ed2892087 100644 --- a/modules/simpletest/tests/update_test_1.info +++ b/modules/simpletest/tests/update_test_1.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info index 3e3b36f65a..5ed2892087 100644 --- a/modules/simpletest/tests/update_test_2.info +++ b/modules/simpletest/tests/update_test_2.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info index 3e3b36f65a..5ed2892087 100644 --- a/modules/simpletest/tests/update_test_3.info +++ b/modules/simpletest/tests/update_test_3.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info index 36d1ef4010..0d55fbf0b2 100644 --- a/modules/simpletest/tests/url_alter_test.info +++ b/modules/simpletest/tests/url_alter_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info index 2c6d90cc30..488bc50bdf 100644 --- a/modules/simpletest/tests/xmlrpc_test.info +++ b/modules/simpletest/tests/xmlrpc_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info index 617ada790d..f078b41436 100644 --- a/modules/statistics/statistics.info +++ b/modules/statistics/statistics.info @@ -6,7 +6,7 @@ core = 7.x files[] = statistics.test configure = admin/config/system/statistics -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info index 0814a39839..28197ac3ed 100644 --- a/modules/syslog/syslog.info +++ b/modules/syslog/syslog.info @@ -6,7 +6,7 @@ core = 7.x files[] = syslog.test configure = admin/config/development/logging -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/system/system.info b/modules/system/system.info index dfaf47feff..74c8fa4aa7 100644 --- a/modules/system/system.info +++ b/modules/system/system.info @@ -12,7 +12,7 @@ files[] = system.test required = TRUE configure = admin/config/system -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/system/system.install b/modules/system/system.install index d5e67435d8..3bb07d955e 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2870,7 +2870,7 @@ function system_update_7061(&$sandbox) { if (!db_table_exists('system_update_7061')) { $table = array( 'description' => t('Stores temporary data for system_update_7061.'), - 'fields' => array('vid' => array('type' => 'int')), + 'fields' => array('vid' => array('type' => 'int', 'not null' => TRUE)), 'primary key' => array('vid'), ); db_create_table('system_update_7061', $table); @@ -3285,6 +3285,13 @@ function system_update_7081() { ->execute(); } +/** + * Add 'jquery-extend-3.4.0.js' to the 'jquery' library. + */ +function system_update_7082() { + // Empty update to force a rebuild of hook_library() and JS aggregates. +} + /** * @} End of "defgroup updates-7.x-extra". * The next series of updates should start at 8000. diff --git a/modules/system/system.module b/modules/system/system.module index 53844d878f..4ce6b9b99d 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1182,6 +1182,9 @@ function system_library() { 'version' => '1.4.4', 'js' => array( 'misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20), + // This includes a security fix, so assign a weight that makes this load + // as soon after jquery.js is loaded as possible. + 'misc/jquery-extend-3.4.0.js' => array('group' => JS_LIBRARY, 'weight' => -19), ), ); diff --git a/modules/system/tests/cron_queue_test.info b/modules/system/tests/cron_queue_test.info index d574d64dce..f43ee03a84 100644 --- a/modules/system/tests/cron_queue_test.info +++ b/modules/system/tests/cron_queue_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/system/tests/system_cron_test.info b/modules/system/tests/system_cron_test.info index d57b6043a4..086825f49f 100644 --- a/modules/system/tests/system_cron_test.info +++ b/modules/system/tests/system_cron_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info index 34e21b910c..28a287ec82 100644 --- a/modules/taxonomy/taxonomy.info +++ b/modules/taxonomy/taxonomy.info @@ -8,7 +8,7 @@ files[] = taxonomy.module files[] = taxonomy.test configure = admin/structure/taxonomy -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info index 55f8c5cfcd..0fb05069e5 100644 --- a/modules/toolbar/toolbar.info +++ b/modules/toolbar/toolbar.info @@ -4,7 +4,7 @@ core = 7.x package = Core version = VERSION -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info index 098696228c..867aa592ba 100644 --- a/modules/tracker/tracker.info +++ b/modules/tracker/tracker.info @@ -6,7 +6,7 @@ version = VERSION core = 7.x files[] = tracker.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info index a4e0bd281d..1efe113d93 100644 --- a/modules/translation/tests/translation_test.info +++ b/modules/translation/tests/translation_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/translation/translation.info b/modules/translation/translation.info index cab857c4bb..7184e9909d 100644 --- a/modules/translation/translation.info +++ b/modules/translation/translation.info @@ -6,7 +6,7 @@ version = VERSION core = 7.x files[] = translation.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info index b49b6e9840..bf83fa0843 100644 --- a/modules/trigger/tests/trigger_test.info +++ b/modules/trigger/tests/trigger_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info index 4baee27e3c..92e6fc83cc 100644 --- a/modules/trigger/trigger.info +++ b/modules/trigger/trigger.info @@ -6,7 +6,7 @@ core = 7.x files[] = trigger.test configure = admin/structure/trigger -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info index e398413064..3d8718ac99 100644 --- a/modules/update/tests/aaa_update_test.info +++ b/modules/update/tests/aaa_update_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info index bf0ea54bd6..9916b50480 100644 --- a/modules/update/tests/bbb_update_test.info +++ b/modules/update/tests/bbb_update_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info index a541d0def9..b80db4dbdc 100644 --- a/modules/update/tests/ccc_update_test.info +++ b/modules/update/tests/ccc_update_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info b/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info index c6507858f6..f3bf0a622b 100644 --- a/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info +++ b/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info @@ -3,7 +3,7 @@ description = Test theme which is used as admin theme. core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info index 4f1bb1251e..27ca277d36 100644 --- a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info +++ b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info @@ -3,7 +3,7 @@ description = Test theme which acts as a base theme for other test subthemes. core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info index b3d8ba9d31..9184b5c562 100644 --- a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info +++ b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info @@ -4,7 +4,7 @@ core = 7.x base theme = update_test_basetheme hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info index 4a0ab86a95..6b6a9f7b88 100644 --- a/modules/update/tests/update_test.info +++ b/modules/update/tests/update_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/update/update.info b/modules/update/update.info index 0f591346f1..9c49f6dcd7 100644 --- a/modules/update/update.info +++ b/modules/update/update.info @@ -6,7 +6,7 @@ core = 7.x files[] = update.test configure = admin/reports/updates/settings -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info index 0526ab2b7b..a761b4e4e5 100644 --- a/modules/user/tests/user_form_test.info +++ b/modules/user/tests/user_form_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/modules/user/user.info b/modules/user/user.info index 6c132a38b0..e23c49137a 100644 --- a/modules/user/user.info +++ b/modules/user/user.info @@ -9,7 +9,7 @@ required = TRUE configure = admin/config/people stylesheets[all][] = user.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/profiles/minimal/minimal.info b/profiles/minimal/minimal.info index a4d469df47..9a5c04d81b 100644 --- a/profiles/minimal/minimal.info +++ b/profiles/minimal/minimal.info @@ -5,7 +5,7 @@ core = 7.x dependencies[] = block dependencies[] = dblog -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/profiles/standard/standard.info b/profiles/standard/standard.info index 9c30220f4a..beff9922b2 100644 --- a/profiles/standard/standard.info +++ b/profiles/standard/standard.info @@ -24,7 +24,7 @@ dependencies[] = field_ui dependencies[] = file dependencies[] = rdf -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info index 2adcf3dc3f..7600c6a30a 100644 --- a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info +++ b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE files[] = drupal_system_listing_compatible_test.test -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info index 8ae9c3fcdd..d81c41ded5 100644 --- a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info +++ b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info @@ -8,7 +8,7 @@ version = VERSION core = 6.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/profiles/testing/testing.info b/profiles/testing/testing.info index a8a2c5c988..6646ce6110 100644 --- a/profiles/testing/testing.info +++ b/profiles/testing/testing.info @@ -4,7 +4,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/test/.gitignore b/test/.gitignore deleted file mode 100644 index 6b9395248d..0000000000 --- a/test/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules -geckodriver diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info index 51eb8125d0..4d6d16837b 100644 --- a/themes/bartik/bartik.info +++ b/themes/bartik/bartik.info @@ -34,7 +34,7 @@ regions[footer] = Footer settings[shortcut_module_link] = 0 -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/themes/garland/garland.info b/themes/garland/garland.info index 450ff95ce7..53ff390dc9 100644 --- a/themes/garland/garland.info +++ b/themes/garland/garland.info @@ -7,7 +7,7 @@ stylesheets[all][] = style.css stylesheets[print][] = print.css settings[garland_width] = fluid -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/themes/seven/seven.info b/themes/seven/seven.info index 5f53557b3b..88d895d660 100644 --- a/themes/seven/seven.info +++ b/themes/seven/seven.info @@ -13,7 +13,7 @@ regions[page_bottom] = Page bottom regions[sidebar_first] = First sidebar regions_hidden[] = sidebar_first -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079" diff --git a/themes/stark/stark.info b/themes/stark/stark.info index a404f692a6..e9b2ee0ad0 100644 --- a/themes/stark/stark.info +++ b/themes/stark/stark.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x stylesheets[all][] = layout.css -; Information added by Drupal.org packaging script on 2019-01-16 -version = "7.63" +; Information added by Drupal.org packaging script on 2019-05-08 +version = "7.67" project = "drupal" -datestamp = "1547681965" +datestamp = "1557336079"