[up] Drupal 7.61

CHANGELOG.txt

@@ -1,3 +1,20 @@
+Drupal 7.61, 2018-11-07
+-----------------------
+- File upload validation functions and hook_file_validate() implementations are
+  now always passed the correct file URI.
+- The default form cache expiration of 6 hours is now configurable (API
+  addition: https://www.drupal.org/node/2857751).
+- Allowed callers of drupal_http_request() to optionally specify an explicit
+  Host header.
+- Allowed the + character to appear in usernames.
+- PHP 7.2: Fixed Archive_Tar incompatibility.
+- PHP 7.2: Removed deprecated function each().
+- PHP 7.2: Avoid count() calls on uncountable variables.
+- PHP 7.2: Removed deprecated create_function() call.
+- PHP 7.2: Make sure variables are arrays in theme_links().
+- Fixed theme-settings.php not being loaded on cached forms
+- Fixed problem with IE11 & Chrome(PointerEvents enabled) & some Firefox scroll to the top of the page after dragging the bottom item with jquery 1.5 <-> 1.11
+
 Drupal 7.60, 2018-10-18
 ------------------------
 - Fixed security issues. See SA-CORE-2018-006.
@@ -8,7 +25,7 @@ Drupal 7.59, 2018-04-25
 
 Drupal 7.58, 2018-03-28
 -----------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2018-002.
+- Fixed security issues (remote code execution). See SA-CORE-2018-002.
 
 Drupal 7.57, 2018-02-21
 -----------------------

MAINTAINERS.txt

@@ -15,6 +15,7 @@ The branch maintainers for Drupal 7 are:
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
 - David Rothstein 'David_Rothstein' https://www.drupal.org/u/david_rothstein
 - Stefan Ruijsenaars 'stefan.r' https://www.drupal.org/u/stefanr-0
+- (provisional) Pol Dellaiera 'Pol' https://www.drupal.org/u/pol
 
 
 Component maintainers
@@ -44,10 +45,9 @@ Cron system
 - Derek Wright 'dww' https://www.drupal.org/u/dww
 
 Database system
-- Larry Garfield 'Crell' https://www.drupal.org/u/crell
+- ?
 
   - MySQL driver
-    - Larry Garfield 'Crell' https://www.drupal.org/u/crell
     - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
 
   - PostgreSQL driver

includes/bootstrap.inc

@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.60');
+define('VERSION', '7.61');
 
 /**
  * Core API compatibility.
@@ -3785,8 +3785,12 @@ function _drupal_shutdown_function() {
   chdir(DRUPAL_ROOT);
 
   try {
-    while (list($key, $callback) = each($callbacks)) {
+    // Manually iterate over the array instead of using a foreach loop.
+    // A foreach operates on a copy of the array, so any shutdown functions that
+    // were added from other shutdown functions would never be called.
+    while ($callback = current($callbacks)) {
       call_user_func_array($callback['callback'], $callback['arguments']);
+      next($callbacks);
     }
   }
   catch (Exception $exception) {

includes/common.inc

@@ -867,8 +867,10 @@ function drupal_http_request($url, array $options = array()) {
       // Make the socket connection to a proxy server.
       $socket = 'tcp://' . $proxy_server . ':' . variable_get('proxy_port', 8080);
       // The Host header still needs to match the real request.
-      $options['headers']['Host'] = $uri['host'];
-      $options['headers']['Host'] .= isset($uri['port']) && $uri['port'] != 80 ? ':' . $uri['port'] : '';
+      if (!isset($options['headers']['Host'])) {
+        $options['headers']['Host'] = $uri['host'];
+        $options['headers']['Host'] .= isset($uri['port']) && $uri['port'] != 80 ? ':' . $uri['port'] : '';
+      }
       break;
 
     case 'http':
@@ -878,14 +880,18 @@ function drupal_http_request($url, array $options = array()) {
       // RFC 2616: "non-standard ports MUST, default ports MAY be included".
       // We don't add the standard port to prevent from breaking rewrite rules
       // checking the host that do not take into account the port number.
-      $options['headers']['Host'] = $uri['host'] . ($port != 80 ? ':' . $port : '');
+      if (!isset($options['headers']['Host'])) {
+        $options['headers']['Host'] = $uri['host'] . ($port != 80 ? ':' . $port : '');
+      }
       break;
 
     case 'https':
       // Note: Only works when PHP is compiled with OpenSSL support.
       $port = isset($uri['port']) ? $uri['port'] : 443;
       $socket = 'ssl://' . $uri['host'] . ':' . $port;
-      $options['headers']['Host'] = $uri['host'] . ($port != 443 ? ':' . $port : '');
+      if (!isset($options['headers']['Host'])) {
+        $options['headers']['Host'] = $uri['host'] . ($port != 443 ? ':' . $port : '');
+      }
       break;
 
     default:

includes/file.inc

@@ -1536,7 +1536,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
   // evaluates to TRUE.
   if (!variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|pl|py|cgi|asp|js)(\.|$)/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
     $file->filemime = 'text/plain';
-    $file->uri .= '.txt';
+    // The destination filename will also later be used to create the URI.
     $file->filename .= '.txt';
     // The .txt extension may not be in the allowed list of extensions. We have
     // to add it here or else the file upload will fail.

includes/form.inc

@@ -555,8 +555,10 @@ function form_get_cache($form_build_id, &$form_state) {
  * Stores a form in the cache.
  */
 function form_set_cache($form_build_id, $form, $form_state) {
-  // 6 hours cache life time for forms should be plenty.
-  $expire = 21600;
+  // The default cache_form expiration is 6 hours. On busy sites, the cache_form
+  // table can become very large. A shorter cache lifetime can help to keep the
+  // table's size under control.
+  $expire = variable_get('form_cache_expiration', 21600);
 
   // Ensure that the form build_id embedded in the form structure is the same as
   // the one passed in as a parameter. This is an additional safety measure to
@@ -1438,10 +1440,12 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) {
       // length if it's a string, and the item count if it's an array.
       // An unchecked checkbox has a #value of integer 0, different than string
       // '0', which could be a valid value.
-      $is_empty_multiple = (!count($elements['#value']));
+      $is_countable = is_array($elements['#value']) || $elements['#value'] instanceof Countable;
+      $is_empty_multiple = $is_countable && count($elements['#value']) == 0;
       $is_empty_string = (is_string($elements['#value']) && drupal_strlen(trim($elements['#value'])) == 0);
       $is_empty_value = ($elements['#value'] === 0);
-      if ($is_empty_multiple || $is_empty_string || $is_empty_value) {
+      $is_empty_null = is_null($elements['#value']);
+      if ($is_empty_multiple || $is_empty_string || $is_empty_value || $is_empty_null) {
         // Although discouraged, a #title is not mandatory for form elements. In
         // case there is no #title, we cannot set a form error message.
         // Instead of setting no #title, form constructors are encouraged to set

includes/install.inc

@@ -779,7 +779,7 @@ function drupal_uninstall_modules($module_list = array(), $uninstall_dependents
     $module_list = array_flip(array_values($module_list));
 
     $profile = drupal_get_profile();
-    while (list($module) = each($module_list)) {
+    foreach (array_keys($module_list) as $module) {
       if (!isset($module_data[$module]) || drupal_get_installed_schema_version($module) == SCHEMA_UNINSTALLED) {
         // This module doesn't exist or is already uninstalled. Skip it.
         unset($module_list[$module]);

includes/menu.inc

@@ -576,7 +576,8 @@ function _menu_load_objects(&$item, &$map) {
           // 'load arguments' in the hook_menu() entry, but they need
           // some processing. In this case the $function is the key to the
           // load_function array, and the value is the list of arguments.
-          list($function, $args) = each($function);
+          $args = current($function);
+          $function = key($function);
           $load_functions[$index] = $function;
 
           // Some arguments are placeholders for dynamic items to process.
@@ -2402,7 +2403,8 @@ function menu_set_active_trail($new_trail = NULL) {
       // a stripped down menu tree containing the active trail only, in case
       // the given menu has not been built in this request yet.
       $tree = menu_tree_page_data($preferred_link['menu_name'], NULL, TRUE);
-      list($key, $curr) = each($tree);
+      $curr = current($tree);
+      next($tree);
     }
     // There is no link for the current path.
     else {
@@ -2432,7 +2434,8 @@ function menu_set_active_trail($new_trail = NULL) {
         }
         $tree = $curr['below'] ? $curr['below'] : array();
       }
-      list($key, $curr) = each($tree);
+      $curr = current($tree);
+      next($tree);
     }
     // Make sure the current page is in the trail to build the page title, by
     // appending either the preferred link or the menu router item for the

includes/module.inc

@@ -404,7 +404,11 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
     // Create an associative array with weights as values.
     $module_list = array_flip(array_values($module_list));
 
-    while (list($module) = each($module_list)) {
+    // The array is iterated over manually (instead of using a foreach) because
+    // modules may be added to the list within the loop and we need to process
+    // them.
+    while ($module = key($module_list)) {
+      next($module_list);
       if (!isset($module_data[$module])) {
         // This module is not found in the filesystem, abort.
         return FALSE;
@@ -540,7 +544,11 @@ function module_disable($module_list, $disable_dependents = TRUE) {
     $module_list = array_flip(array_values($module_list));
 
     $profile = drupal_get_profile();
-    while (list($module) = each($module_list)) {
+    // The array is iterated over manually (instead of using a foreach) because
+    // modules may be added to the list within the loop and we need to process
+    // them.
+    while ($module = key($module_list)) {
+      next($module_list);
       if (!isset($module_data[$module]) || !$module_data[$module]->status) {
         // This module doesn't exist or is already disabled, skip it.
         unset($module_list[$module]);

includes/theme.inc

@@ -1776,13 +1776,13 @@ function theme_link($variables) {
  *     http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
  */
 function theme_links($variables) {
-  $links = $variables['links'];
-  $attributes = $variables['attributes'];
+  $links = (array) $variables['links'];
+  $attributes = (array) $variables['attributes'];
   $heading = $variables['heading'];
   global $language_url;
   $output = '';
 
-  if (count($links) > 0) {
+  if (!empty($links)) {
     // Treat the heading first if it is present to prepend it to the
     // list of links.
     if (!empty($heading)) {
@@ -1995,7 +1995,7 @@ function theme_table($variables) {
   $empty = $variables['empty'];
 
   // Add sticky headers, if applicable.
-  if (count($header) && $sticky) {
+  if (!empty($header) && $sticky) {
     drupal_add_js('misc/tableheader.js');
     // Add 'sticky-enabled' class to the table to identify it for JS.
     // This is needed to target tables constructed by this function.
@@ -2009,7 +2009,7 @@ function theme_table($variables) {
   }
 
   // Format the table columns:
-  if (count($colgroups)) {
+  if (!empty($colgroups)) {
     foreach ($colgroups as $number => $colgroup) {
       $attributes = array();
 
@@ -2044,38 +2044,40 @@ function theme_table($variables) {
   }
 
   // Add the 'empty' row message if available.
-  if (!count($rows) && $empty) {
+  if (empty($rows) && $empty) {
     $header_count = 0;
-    foreach ($header as $header_cell) {
-      if (is_array($header_cell)) {
-        $header_count += isset($header_cell['colspan']) ? $header_cell['colspan'] : 1;
-      }
-      else {
-        $header_count++;
+    if (!empty($header)) {
+      foreach ($header as $header_cell) {
+        if (is_array($header_cell)) {
+          $header_count += isset($header_cell['colspan']) ? $header_cell['colspan'] : 1;
+        }
+        else {
+          $header_count++;
+        }
       }
     }
     $rows[] = array(array('data' => $empty, 'colspan' => $header_count, 'class' => array('empty', 'message')));
   }
 
   // Format the table header:
-  if (count($header)) {
+  if (!empty($header)) {
     $ts = tablesort_init($header);
     // HTML requires that the thead tag has tr tags in it followed by tbody
     // tags. Using ternary operator to check and see if we have any rows.
-    $output .= (count($rows) ? ' <thead><tr>' : ' <tr>');
+    $output .= (!empty($rows) ? ' <thead><tr>' : ' <tr>');
     foreach ($header as $cell) {
       $cell = tablesort_header($cell, $header, $ts);
       $output .= _theme_table_cell($cell, TRUE);
     }
     // Using ternary operator to close the tags based on whether or not there are rows
-    $output .= (count($rows) ? " </tr></thead>\n" : "</tr>\n");
+    $output .= (!empty($rows) ? " </tr></thead>\n" : "</tr>\n");
   }
   else {
     $ts = array();
   }
 
   // Format the table rows:
-  if (count($rows)) {
+  if (!empty($rows)) {
     $output .= "<tbody>\n";
     $flip = array('even' => 'odd', 'odd' => 'even');
     $class = 'even';
@@ -2095,7 +2097,7 @@ function theme_table($variables) {
         $attributes = array();
         $no_striping = FALSE;
       }
-      if (count($cells)) {
+      if (!empty($cells)) {
         // Add odd/even class
         if (!$no_striping) {
           $class = $flip[$class];

misc/tabledrag.js

@@ -580,21 +580,43 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) {
  * Get the mouse coordinates from the event (allowing for browser differences).
  */
 Drupal.tableDrag.prototype.mouseCoords = function (event) {
+
+  // Match both null and undefined, but not zero, by using != null.
+  // See https://stackoverflow.com/questions/2647867/how-to-determine-if-variable-is-undefined-or-null
+  if (event.pageX != null && event.pageY != null) {
+    return {x: event.pageX, y: event.pageY};
+  }
+
   // Complete support for pointer events was only introduced to jQuery in
   // version 1.11.1; between versions 1.7 and 1.11.0 pointer events have the
-  // clientX and clientY properties undefined. In those cases, the properties
-  // must be retrieved from the event.originalEvent object instead.
-  var clientX = event.clientX || event.originalEvent.clientX;
-  var clientY = event.clientY || event.originalEvent.clientY;
+  // pageX and pageY properties undefined. In those cases, the properties must
+  // be retrieved from the event.originalEvent object instead.
+  if (event.originalEvent && event.originalEvent.pageX != null && event.originalEvent.pageY != null) {
+    return {x: event.originalEvent.pageX, y: event.originalEvent.pageY};
+  }
 
-  if (event.pageX || event.pageY) {
-    return { x: event.pageX, y: event.pageY };
+  // Some old browsers do not support MouseEvent.pageX and *.pageY at all.
+  // See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/pageY
+  // For those, we look at event.clientX and event.clientY instead.
+  if (event.clientX == null || event.clientY == null) {
+    // In some jQuery versions, some events created by jQuery do not have
+    // clientX and clientY. But the original event might have.
+    if (!event.originalEvent) {
+      throw new Error("The event has no coordinates, and no event.originalEvent.");
+    }
+    event = event.originalEvent;
+    if (event.clientX == null || event.clientY == null) {
+      throw new Error("The original event has no coordinates.");
+    }
   }
 
-  return {
-    x: clientX + document.body.scrollLeft - document.body.clientLeft,
-    y: clientY + document.body.scrollTop  - document.body.clientTop
-  };
+  // Copied from jQuery.event.fix() in jQuery 1.4.1.
+  // In newer jQuery versions, this code is in jQuery.event.mouseHooks.filter().
+  var doc = document.documentElement, body = document.body;
+  var pageX = event.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+  var pageY = event.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+
+  return {x: pageX, y: pageY};
 };
 
 /**

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/blog/blog.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = blog.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/book/book.module

@@ -768,11 +768,13 @@ function book_prev($book_link) {
     return NULL;
   }
   $flat = book_get_flat_menu($book_link);
-  // Assigning the array to $flat resets the array pointer for use with each().
+  reset($flat);
   $curr = NULL;
   do {
     $prev = $curr;
-    list($key, $curr) = each($flat);
+    $curr = current($flat);
+    $key = key($flat);
+    next($flat);
   } while ($key && $key != $book_link['mlid']);
 
   if ($key == $book_link['mlid']) {
@@ -806,9 +808,10 @@ function book_prev($book_link) {
  */
 function book_next($book_link) {
   $flat = book_get_flat_menu($book_link);
-  // Assigning the array to $flat resets the array pointer for use with each().
+  reset($flat);
   do {
-    list($key, $curr) = each($flat);
+    $key = key($flat);
+    next($flat);
   }
   while ($key && $key != $book_link['mlid']);
 

modules/color/color.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = color.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/contextual/contextual.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = contextual.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/dblog/dblog.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = dblog.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/field/modules/list/list.install

@@ -61,7 +61,7 @@ function list_update_7001() {
 
       // Additionally, float keys need to be disambiguated ('.5' is '0.5').
       if ($field['type'] == 'list_number' && !empty($allowed_values)) {
-        $keys = array_map(create_function('$a', 'return (string) (float) $a;'), array_keys($allowed_values));
+        $keys = array_map('_list_update_7001_float_string_cast', array_keys($allowed_values));
         $allowed_values = array_combine($keys, array_values($allowed_values));
       }
 
@@ -89,6 +89,13 @@ function list_update_7001() {
 }
 
 /**
+ * Helper callback function to cast the array element.
+ */
+function _list_update_7001_float_string_cast($element) {
+  return (string) (float) $element;
+}
+
+/**
  * Helper function for list_update_7001: extract allowed values from a string.
  *
  * This reproduces the parsing logic in use before D7 RC2.

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/help/help.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = help.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/image/image.admin.inc

@@ -736,7 +736,8 @@ function theme_image_style_effects($variables) {
     if (!isset($form[$key]['#access']) || $form[$key]['#access']) {
       $rows[] = array(
         'data' => $row,
-        'class' => !empty($form[$key]['weight']['#access']) || $key == 'new' ? array('draggable') : array(),
+        // Use a strict (===) comparison since $key can be 0.
+        'class' => !empty($form[$key]['weight']['#access']) || $key === 'new' ? array('draggable') : array(),
       );
     }
   }

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/locale/locale.test

@@ -3188,11 +3188,7 @@ class LocaleLanguageNegotiationInfoFunctionalTest extends DrupalWebTestCase {
     foreach (language_types_info() as $type => $info) {
       if (isset($info['fixed'])) {
         $negotiation = variable_get("language_negotiation_$type", array());
-        $equal = count($info['fixed']) == count($negotiation);
-        while ($equal && list($id) = each($negotiation)) {
-          list(, $info_id) = each($info['fixed']);
-          $equal = $info_id == $id;
-        }
+        $equal = array_keys($negotiation) === array_values($info['fixed']);
         $this->assertTrue($equal, format_string('language negotiation for %type is properly set up', array('%type' => $type)));
       }
     }

modules/locale/tests/locale_test.info

@@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/openid/openid.info

@@ -5,7 +5,7 @@ package = Core
 core = 7.x
 files[] = openid.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/overlay/overlay.info

@@ -4,7 +4,7 @@ package = Core
 version = VERSION
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/php/php.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = php.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/rdf/rdf.info

@@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 files[] = rdf.test
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/simpletest/tests/database_test.info

@@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/simpletest/tests/form.test

@@ -1421,6 +1421,59 @@ class FormsFormStoragePageCacheTestCase extends DrupalWebTestCase {
 }
 
 /**
+ * Test cache_form.
+ */
+class FormsFormCacheTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Form caching',
+      'description' => 'Tests storage and retrieval of forms from cache.',
+      'group' => 'Form API',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('form_test');
+  }
+
+  /**
+   * Tests storing and retrieving the form from cache.
+   */
+  function testCacheForm() {
+    $form = drupal_get_form('form_test_cache_form');
+    $form_state = array('foo' => 'bar', 'build_info' => array('baz'));
+    form_set_cache($form['#build_id'], $form, $form_state);
+
+    $cached_form_state = array();
+    $cached_form = form_get_cache($form['#build_id'], $cached_form_state);
+
+    $this->assertEqual($cached_form['#build_id'], $form['#build_id'], 'Form retrieved from cache_form successfully.');
+    $this->assertEqual($cached_form_state['foo'], 'bar', 'Data retrieved from cache_form successfully.');
+  }
+
+  /**
+   * Tests changing form_cache_expiration.
+   */
+  function testCacheFormCustomExpiration() {
+    variable_set('form_cache_expiration', -1 * (24 * 60 * 60));
+
+    $form = drupal_get_form('form_test_cache_form');
+    $form_state = array('foo' => 'bar', 'build_info' => array('baz'));
+    form_set_cache($form['#build_id'], $form, $form_state);
+
+    // Clear expired entries from cache_form, which should include the entry we
+    // just stored. Without this, the form will still be retrieved from cache.
+    cache_clear_all(NULL, 'cache_form');
+
+    $cached_form_state = array();
+    $cached_form = form_get_cache($form['#build_id'], $cached_form_state);
+
+    $this->assertNull($cached_form, 'Expired form was not returned from cache.');
+    $this->assertTrue(empty($cached_form_state), 'No data retrieved from cache for expired form.');
+  }
+}
+
+/**
  * Test wrapper form callbacks.
  */
 class FormsFormWrapperTestCase extends DrupalWebTestCase {

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

modules/simpletest/tests/form_test.module

@@ -919,6 +919,24 @@ function form_test_storage_page_cache_rebuild($form, &$form_state) {
 }
 
 /**
+ * A simple form for testing form caching.
+ */
+function form_test_cache_form($form, &$form_state) {
+  $form['title'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Title',
+    '#required' => TRUE,
+  );
+
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => 'Save',
+  );
+
+  return $form;
+}
+
+/**
  * A form for testing form labels and required marks.
  */
 function form_label_test_form() {

modules/simpletest/tests/image.test

@@ -335,7 +335,9 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
     );
 
     // Systems using non-bundled GD2 don't have imagerotate. Test if available.
-    if (function_exists('imagerotate')) {
+    // @todo Remove the version check once https://www.drupal.org/node/2918570
+    //   is resolved.
+    if (function_exists('imagerotate') && (version_compare(PHP_VERSION, '7.0.26', '<') || (version_compare(PHP_VERSION, '7.1', '>=') && version_compare(PHP_VERSION, '7.1.12', '<')))) {
       $operations += array(
         'rotate_90' => array(
           'function' => 'rotate',
@@ -357,8 +359,8 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
       // See https://bugs.php.net/bug.php?id=65148.
       // For the 40x20 test images, the dimensions resulting from rotation will
       // be 1 pixel smaller in both width and height in PHP 5.5 and above.
-      // @todo: If and when the PHP bug gets solved, add an upper limit
-      //   version check.
+      // @todo: The PHP bug was fixed in PHP 7.0.26 and 7.1.12. Change the code
+      //   below to reflect that in https://www.drupal.org/node/2918570.
       if (version_compare(PHP_VERSION, '5.5', '>=')) {
         $operations += array(
           'rotate_5' => array(

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"

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 2018-10-17
-version = "7.60"
+; Information added by Drupal.org packaging script on 2018-11-08
+version = "7.61"
 project = "drupal"
-datestamp = "1539816636"
+datestamp = "1541684322"