Browse Source

core update 7.20

Signed-off-by: bachy <git@g-u-i.net>
bachy 11 years ago
parent
commit
8c47736b71
100 changed files with 366 additions and 321 deletions
  1. 5 0
      CHANGELOG.txt
  2. 1 1
      includes/bootstrap.inc
  3. 0 12
      includes/entity.inc
  4. 2 3
      misc/autocomplete.js
  5. 3 3
      modules/aggregator/aggregator.info
  6. 3 3
      modules/aggregator/tests/aggregator_test.info
  7. 3 3
      modules/block/block.info
  8. 3 3
      modules/block/tests/block_test.info
  9. 3 3
      modules/block/tests/themes/block_test_theme/block_test_theme.info
  10. 3 3
      modules/blog/blog.info
  11. 3 3
      modules/book/book.info
  12. 3 3
      modules/color/color.info
  13. 3 3
      modules/comment/comment.info
  14. 3 3
      modules/contact/contact.info
  15. 3 3
      modules/contextual/contextual.info
  16. 3 3
      modules/dashboard/dashboard.info
  17. 3 3
      modules/dblog/dblog.info
  18. 3 3
      modules/field/field.info
  19. 3 3
      modules/field/modules/field_sql_storage/field_sql_storage.info
  20. 3 3
      modules/field/modules/list/list.info
  21. 3 3
      modules/field/modules/list/tests/list_test.info
  22. 3 3
      modules/field/modules/number/number.info
  23. 3 3
      modules/field/modules/options/options.info
  24. 3 3
      modules/field/modules/text/text.info
  25. 3 3
      modules/field/tests/field_test.info
  26. 3 3
      modules/field_ui/field_ui.info
  27. 3 3
      modules/file/file.info
  28. 3 3
      modules/file/tests/file_module_test.info
  29. 3 3
      modules/filter/filter.info
  30. 3 3
      modules/forum/forum.info
  31. 3 3
      modules/help/help.info
  32. 3 3
      modules/image/image.info
  33. 47 7
      modules/image/image.module
  34. 29 16
      modules/image/image.test
  35. 3 3
      modules/image/tests/image_module_test.info
  36. 3 3
      modules/locale/locale.info
  37. 3 3
      modules/locale/tests/locale_test.info
  38. 3 3
      modules/menu/menu.info
  39. 3 3
      modules/node/node.info
  40. 3 3
      modules/node/tests/node_access_test.info
  41. 3 3
      modules/node/tests/node_test.info
  42. 3 3
      modules/node/tests/node_test_exception.info
  43. 3 3
      modules/openid/openid.info
  44. 3 3
      modules/openid/tests/openid_test.info
  45. 3 3
      modules/overlay/overlay.info
  46. 3 3
      modules/path/path.info
  47. 3 3
      modules/php/php.info
  48. 3 3
      modules/poll/poll.info
  49. 3 3
      modules/profile/profile.info
  50. 3 3
      modules/rdf/rdf.info
  51. 3 3
      modules/rdf/tests/rdf_test.info
  52. 3 3
      modules/search/search.info
  53. 3 3
      modules/search/tests/search_embedded_form.info
  54. 3 3
      modules/search/tests/search_extra_type.info
  55. 3 3
      modules/shortcut/shortcut.info
  56. 3 3
      modules/simpletest/simpletest.info
  57. 3 3
      modules/simpletest/tests/actions_loop_test.info
  58. 3 3
      modules/simpletest/tests/ajax_forms_test.info
  59. 3 3
      modules/simpletest/tests/ajax_test.info
  60. 3 3
      modules/simpletest/tests/batch_test.info
  61. 3 3
      modules/simpletest/tests/common_test.info
  62. 3 3
      modules/simpletest/tests/common_test_cron_helper.info
  63. 3 3
      modules/simpletest/tests/database_test.info
  64. 3 3
      modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
  65. 3 3
      modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
  66. 3 3
      modules/simpletest/tests/entity_cache_test.info
  67. 3 3
      modules/simpletest/tests/entity_cache_test_dependency.info
  68. 3 3
      modules/simpletest/tests/entity_crud_hook_test.info
  69. 3 3
      modules/simpletest/tests/entity_query_access_test.info
  70. 3 3
      modules/simpletest/tests/error_test.info
  71. 3 3
      modules/simpletest/tests/file_test.info
  72. 3 3
      modules/simpletest/tests/filter_test.info
  73. 3 3
      modules/simpletest/tests/form_test.info
  74. 3 3
      modules/simpletest/tests/image_test.info
  75. 3 3
      modules/simpletest/tests/menu_test.info
  76. 3 3
      modules/simpletest/tests/module_test.info
  77. 3 3
      modules/simpletest/tests/path_test.info
  78. 3 3
      modules/simpletest/tests/requirements1_test.info
  79. 3 3
      modules/simpletest/tests/requirements2_test.info
  80. 3 3
      modules/simpletest/tests/session_test.info
  81. 3 3
      modules/simpletest/tests/system_dependencies_test.info
  82. 3 3
      modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
  83. 3 3
      modules/simpletest/tests/system_incompatible_core_version_test.info
  84. 3 3
      modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
  85. 3 3
      modules/simpletest/tests/system_incompatible_module_version_test.info
  86. 3 3
      modules/simpletest/tests/system_test.info
  87. 3 3
      modules/simpletest/tests/taxonomy_test.info
  88. 3 3
      modules/simpletest/tests/theme_test.info
  89. 3 3
      modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
  90. 3 3
      modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
  91. 3 3
      modules/simpletest/tests/themes/test_theme/test_theme.info
  92. 3 3
      modules/simpletest/tests/update_script_test.info
  93. 3 3
      modules/simpletest/tests/update_test_1.info
  94. 3 3
      modules/simpletest/tests/update_test_2.info
  95. 3 3
      modules/simpletest/tests/update_test_3.info
  96. 3 3
      modules/simpletest/tests/url_alter_test.info
  97. 3 3
      modules/simpletest/tests/xmlrpc_test.info
  98. 3 3
      modules/statistics/statistics.info
  99. 3 3
      modules/syslog/syslog.info
  100. 3 3
      modules/system/system.info

+ 5 - 0
CHANGELOG.txt

@@ -1,3 +1,8 @@
+
+Drupal 7.20, 2013-02-20
+-----------------------
+- Fixed security issues (denial of service). See SA-CORE-2013-002.
+
 Drupal 7.19, 2013-01-16
 -----------------------
 - Fixed security issues (multiple vulnerabilities). See SA-CORE-2013-001.

+ 1 - 1
includes/bootstrap.inc

@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.19');
+define('VERSION', '7.20');
 
 /**
  * Core API compatibility.

+ 0 - 12
includes/entity.inc

@@ -160,18 +160,6 @@ class DrupalDefaultEntityController implements DrupalEntityControllerInterface {
   public function load($ids = array(), $conditions = array()) {
     $entities = array();
 
-    # PATCH http://drupal.org/node/1003788#comment-5195682
-    // Clean the $ids array to remove non-integer values that can be passed
-    // in from various sources, including menu callbacks.
-    if (is_array($ids)) {
-      foreach ($ids as $key => $id) {
-        if (empty($id) || ((string) $id !== (string) (int) $id)) {
-          unset($ids[$key]);
-        }
-      }
-    }
-    # endpatch
-
     // Revisions are not statically cached, and require a different query to
     // other conditions, so separate the revision id into its own variable.
     if ($this->revisionKey && isset($conditions[$this->revisionKey])) {

+ 2 - 3
misc/autocomplete.js

@@ -114,7 +114,6 @@ Drupal.jsAC.prototype.onkeyup = function (input, e) {
  */
 Drupal.jsAC.prototype.select = function (node) {
   this.input.value = $(node).data('autocompleteValue');
-  $(this.input).trigger('autocompleteSelect', [node]);
 };
 
 /**
@@ -168,7 +167,7 @@ Drupal.jsAC.prototype.unhighlight = function (node) {
 Drupal.jsAC.prototype.hidePopup = function (keycode) {
   // Select item if the right key or mousebutton was pressed.
   if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
-    this.select(this.selected);
+    this.input.value = $(this.selected).data('autocompleteValue');
   }
   // Hide popup.
   var popup = this.popup;
@@ -221,7 +220,7 @@ Drupal.jsAC.prototype.found = function (matches) {
   for (key in matches) {
     $('<li></li>')
       .html($('<div></div>').html(matches[key]))
-      .mousedown(function () { ac.hidePopup(this); })
+      .mousedown(function () { ac.select(this); })
       .mouseover(function () { ac.highlight(this); })
       .mouseout(function () { ac.unhighlight(this); })
       .data('autocompleteValue', key)

+ 3 - 3
modules/aggregator/aggregator.info

@@ -7,8 +7,8 @@ files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/aggregator/tests/aggregator_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/block/block.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = block.test
 configure = admin/structure/block
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/block/tests/block_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/block/tests/themes/block_test_theme/block_test_theme.info

@@ -13,8 +13,8 @@ regions[footer] = Footer
 regions[highlighted] = Highlighted
 regions[help] = Help
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/blog/blog.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = blog.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/book/book.info

@@ -7,8 +7,8 @@ files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/color/color.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = color.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/comment/comment.info

@@ -9,8 +9,8 @@ files[] = comment.test
 configure = admin/content/comment
 stylesheets[all][] = comment.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/contact/contact.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = contact.test
 configure = admin/structure/contact
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/contextual/contextual.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = contextual.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/dashboard/dashboard.info

@@ -7,8 +7,8 @@ files[] = dashboard.test
 dependencies[] = block
 configure = admin/dashboard/customize
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/dblog/dblog.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = dblog.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/field.info

@@ -10,8 +10,8 @@ dependencies[] = field_sql_storage
 required = TRUE
 stylesheets[all][] = theme/field.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/modules/field_sql_storage/field_sql_storage.info

@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = field_sql_storage.test
 required = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/modules/list/list.info

@@ -7,8 +7,8 @@ dependencies[] = field
 dependencies[] = options
 files[] = tests/list.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/modules/list/tests/list_test.info

@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/modules/number/number.info

@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = number.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/modules/options/options.info

@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = options.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/modules/text/text.info

@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = text.test
 required = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field/tests/field_test.info

@@ -6,8 +6,8 @@ files[] = field_test.entity.inc
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/field_ui/field_ui.info

@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = field_ui.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/file/file.info

@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = tests/file.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/file/tests/file_module_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/filter/filter.info

@@ -7,8 +7,8 @@ files[] = filter.test
 required = TRUE
 configure = admin/config/content/formats
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/forum/forum.info

@@ -9,8 +9,8 @@ files[] = forum.test
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/help/help.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = help.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/image/image.info

@@ -7,8 +7,8 @@ dependencies[] = file
 files[] = image.test
 configure = admin/config/media/image-styles
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 47 - 7
modules/image/image.module

@@ -30,6 +30,11 @@ define('IMAGE_STORAGE_EDITABLE', IMAGE_STORAGE_NORMAL | IMAGE_STORAGE_OVERRIDE);
  */
 define('IMAGE_STORAGE_MODULE', IMAGE_STORAGE_OVERRIDE | IMAGE_STORAGE_DEFAULT);
 
+/**
+ * The name of the query parameter for image derivative tokens.
+ */
+define('IMAGE_DERIVATIVE_TOKEN', 'itok');
+
 // Load all Field module hooks for Image.
 require_once DRUPAL_ROOT . '/modules/image/image.field.inc';
 
@@ -766,16 +771,24 @@ function image_style_options($include_empty = TRUE) {
  *   The image style
  */
 function image_style_deliver($style, $scheme) {
-  // Check that the style is defined and the scheme is valid.
-  if (!$style || !file_stream_wrapper_valid_scheme($scheme)) {
-    drupal_exit();
-  }
-
   $args = func_get_args();
   array_shift($args);
   array_shift($args);
   $target = implode('/', $args);
 
+  // Check that the style is defined, the scheme is valid, and the image
+  // derivative token is valid. (Sites which require image derivatives to be
+  // generated without a token can set the 'image_allow_insecure_derivatives'
+  // variable to TRUE to bypass the latter check, but this will increase the
+  // site's vulnerability to denial-of-service attacks.)
+  $valid = !empty($style) && file_stream_wrapper_valid_scheme($scheme);
+  if (!variable_get('image_allow_insecure_derivatives', FALSE)) {
+    $valid = $valid && isset($_GET[IMAGE_DERIVATIVE_TOKEN]) && $_GET[IMAGE_DERIVATIVE_TOKEN] === image_style_path_token($style['name'], $scheme . '://' . $target);
+  }
+  if (!$valid) {
+    return MENU_ACCESS_DENIED;
+  }
+
   $image_uri = $scheme . '://' . $target;
   $derivative_uri = image_style_path($style['name'], $image_uri);
 
@@ -960,6 +973,10 @@ function image_style_flush($style) {
  */
 function image_style_url($style_name, $path) {
   $uri = image_style_path($style_name, $path);
+  // The token query is added even if the 'image_allow_insecure_derivatives'
+  // variable is TRUE, so that the emitted links remain valid if it is changed
+  // back to the default FALSE.
+  $token_query = array(IMAGE_DERIVATIVE_TOKEN => image_style_path_token($style_name, $path));
 
   // If not using clean URLs, the image derivative callback is only available
   // with the query string. If the file does not exist, use url() to ensure
@@ -967,10 +984,33 @@ function image_style_url($style_name, $path) {
   // actual file path, this avoids bootstrapping PHP once the files are built.
   if (!variable_get('clean_url') && file_uri_scheme($uri) == 'public' && !file_exists($uri)) {
     $directory_path = file_stream_wrapper_get_instance_by_uri($uri)->getDirectoryPath();
-    return url($directory_path . '/' . file_uri_target($uri), array('absolute' => TRUE));
+    return url($directory_path . '/' . file_uri_target($uri), array('absolute' => TRUE, 'query' => $token_query));
   }
 
-  return file_create_url($uri);
+  $file_url = file_create_url($uri);
+  // Append the query string with the token.
+  return $file_url . (strpos($file_url, '?') !== FALSE ? '&' : '?') . drupal_http_build_query($token_query);
+}
+
+/**
+ * Generates a token to protect an image style derivative.
+ *
+ * This prevents unauthorized generation of an image style derivative,
+ * which can be costly both in CPU time and disk space.
+ *
+ * @param $style_name
+ *   The name of the image style.
+ * @param $uri
+ *   The URI of the image for this style, for example as returned by
+ *   image_style_path().
+ *
+ * @return
+ *   An eight-character token which can be used to protect image style
+ *   derivatives against denial-of-service attacks.
+ */
+function image_style_path_token($style_name, $uri) {
+  // Return the first eight characters.
+  return substr(drupal_hmac_base64($style_name . ':' . $uri, drupal_get_private_key() . drupal_get_hash_salt()), 0, 8);
 }
 
 /**

+ 29 - 16
modules/image/image.test

@@ -192,13 +192,19 @@ class ImageStylesPathAndUrlTestCase extends DrupalWebTestCase {
     $this->assertNotIdentical(FALSE, $original_uri, t('Created the generated image file.'));
 
     // Get the URL of a file that has not been generated and try to create it.
-    $generated_uri = $scheme . '://styles/' . $this->style_name . '/' . $scheme . '/'. drupal_basename($original_uri);
+    $generated_uri = image_style_path($this->style_name, $original_uri);
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $generate_url = image_style_url($this->style_name, $original_uri);
 
     if (!$clean_url) {
       $this->assertTrue(strpos($generate_url, '?q=') !== FALSE, 'When using non-clean URLS, the system path contains the query string.');
     }
+    // Add some extra chars to the token.
+    $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
+    $this->assertResponse(403, 'Image was inaccessible at the URL wih an invalid token.');
+    // Change the parameter name so the token is missing.
+    $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $generate_url));
+    $this->assertResponse(403, 'Image was inaccessible at the URL wih a missing token.');
 
     // Fetch the URL that generates the file.
     $this->drupalGet($generate_url);
@@ -238,6 +244,11 @@ class ImageStylesPathAndUrlTestCase extends DrupalWebTestCase {
         $this->assertNoRaw( chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10), 'No PNG signature found in the response body.');
       }
     }
+    elseif ($clean_url) {
+      // Add some extra chars to the token.
+      $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
+      $this->assertResponse(200, 'Existing image was accessible at the URL wih an invalid token.');
+    }
   }
 }
 
@@ -661,7 +672,7 @@ class ImageAdminStylesUnitTest extends ImageFieldTestCase {
 
     // Test that image is displayed using newly created style.
     $this->drupalGet('node/' . $nid);
-    $this->assertRaw(image_style_url($style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style @style.', array('@style' => $style_name)));
+    $this->assertRaw(check_plain(image_style_url($style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri'])), t('Image displayed using style @style.', array('@style' => $style_name)));
 
     // Rename the style and make sure the image field is updated.
     $new_style_name = strtolower($this->randomName(10));
@@ -671,7 +682,7 @@ class ImageAdminStylesUnitTest extends ImageFieldTestCase {
     $this->drupalPost('admin/config/media/image-styles/edit/' . $style_name, $edit, t('Update style'));
     $this->assertText(t('Changes to the style have been saved.'), t('Style %name was renamed to %new_name.', array('%name' => $style_name, '%new_name' => $new_style_name)));
     $this->drupalGet('node/' . $nid);
-    $this->assertRaw(image_style_url($new_style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style replacement style.'));
+    $this->assertRaw(check_plain(image_style_url($new_style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri'])), t('Image displayed using style replacement style.'));
 
     // Delete the style and choose a replacement style.
     $edit = array(
@@ -682,7 +693,7 @@ class ImageAdminStylesUnitTest extends ImageFieldTestCase {
     $this->assertRaw($message, $message);
 
     $this->drupalGet('node/' . $nid);
-    $this->assertRaw(image_style_url('thumbnail', $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style replacement style.'));
+    $this->assertRaw(check_plain(image_style_url('thumbnail', $node->{$field_name}[LANGUAGE_NONE][0]['uri'])), t('Image displayed using style replacement style.'));
   }
 }
 
@@ -775,7 +786,9 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
     // Ensure the derivative image is generated so we do not have to deal with
     // image style callback paths.
     $this->drupalGet(image_style_url('thumbnail', $image_uri));
-    $image_info['path'] = image_style_path('thumbnail', $image_uri);
+    // Need to create the URL again since it will change if clean URLs
+    // are disabled.
+    $image_info['path'] = image_style_url('thumbnail', $image_uri);
     $image_info['width'] = 100;
     $image_info['height'] = 50;
     $default_output = theme('image', $image_info);
@@ -1061,7 +1074,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" width="120" height="60" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" width="120" height="60" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1082,7 +1095,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" width="60" height="120" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" width="60" height="120" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1104,7 +1117,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" width="45" height="90" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" width="45" height="90" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1126,7 +1139,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" width="45" height="90" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" width="45" height="90" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1144,7 +1157,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" width="45" height="90" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" width="45" height="90" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1165,7 +1178,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1185,7 +1198,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" width="30" height="30" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" width="30" height="30" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1206,7 +1219,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     $effect = image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" alt="" />', t('Expected img tag was found.'));
     $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
     $this->drupalGet($url);
     $this->assertResponse(200, t('Image was generated at the URL.'));
@@ -1224,7 +1237,7 @@ class ImageDimensionsTestCase extends DrupalWebTestCase {
 
     image_effect_save($effect);
     $img_tag = theme_image_style($variables);
-    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . $url . '" alt="" />', t('Expected img tag was found.'));
+    $this->assertEqual($img_tag, '<img typeof="foaf:Image" src="' . check_plain($url) . '" alt="" />', t('Expected img tag was found.'));
   }
 }
 
@@ -1642,7 +1655,7 @@ class ImageThemeFunctionWebTestCase extends DrupalWebTestCase {
       ),
     );
     $rendered_element = render($element);
-    $expected_result = '<a href="' . url($path) . '"><img typeof="foaf:Image" src="' . $url . '" alt="" /></a>';
+    $expected_result = '<a href="' . url($path) . '"><img typeof="foaf:Image" src="' . check_plain($url) . '" alt="" /></a>';
     $this->assertEqual($expected_result, $rendered_element, 'theme_image_formatter() correctly renders without title, alt, or path options.');
 
     // Link the image to a fragment on the page, and not a full URL.
@@ -1653,7 +1666,7 @@ class ImageThemeFunctionWebTestCase extends DrupalWebTestCase {
       'fragment' => $fragment,
     );
     $rendered_element = render($element);
-    $expected_result = '<a href="#' . $fragment . '"><img typeof="foaf:Image" src="' . $url . '" alt="" /></a>';
+    $expected_result = '<a href="#' . $fragment . '"><img typeof="foaf:Image" src="' . check_plain($url) . '" alt="" /></a>';
     $this->assertEqual($expected_result, $rendered_element, 'theme_image_formatter() correctly renders a link fragment.');
   }
 

+ 3 - 3
modules/image/tests/image_module_test.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = image_module_test.module
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/locale/locale.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = locale.test
 configure = admin/config/regional/language
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/locale/tests/locale_test.info

@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/menu/menu.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = menu.test
 configure = admin/structure/menu
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/node/node.info

@@ -9,8 +9,8 @@ required = TRUE
 configure = admin/structure/types
 stylesheets[all][] = node.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/node/tests/node_access_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/node/tests/node_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/node/tests/node_test_exception.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/openid/openid.info

@@ -5,8 +5,8 @@ package = Core
 core = 7.x
 files[] = openid.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/openid/tests/openid_test.info

@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = openid
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/overlay/overlay.info

@@ -4,8 +4,8 @@ package = Core
 version = VERSION
 core = 7.x
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/path/path.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = path.test
 configure = admin/config/search/path
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/php/php.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = php.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/poll/poll.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = poll.test
 stylesheets[all][] = poll.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/profile/profile.info

@@ -11,8 +11,8 @@ configure = admin/config/people/profile
 ; See user_system_info_alter().
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/rdf/rdf.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = rdf.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/rdf/tests/rdf_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/search/search.info

@@ -8,8 +8,8 @@ files[] = search.test
 configure = admin/config/search/settings
 stylesheets[all][] = search.css
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/search/tests/search_embedded_form.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/search/tests/search_extra_type.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/shortcut/shortcut.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = shortcut.test
 configure = admin/config/user-interface/shortcut
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/simpletest.info

@@ -55,8 +55,8 @@ 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 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/actions_loop_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/ajax_forms_test.info

@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/ajax_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/batch_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/common_test.info

@@ -7,8 +7,8 @@ stylesheets[all][] = common_test.css
 stylesheets[print][] = common_test.print.css
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/common_test_cron_helper.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/database_test.info

@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/entity_cache_test.info

@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/entity_cache_test_dependency.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/entity_crud_hook_test.info

@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/entity_query_access_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/error_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/file_test.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = file_test.module
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/filter_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/form_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/image_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/menu_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/module_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/path_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/requirements1_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/requirements2_test.info

@@ -7,8 +7,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/session_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/system_dependencies_test.info

@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 dependencies[] = _missing_dependency
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info

@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 dependencies[] = system_incompatible_core_version_test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/system_incompatible_core_version_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 5.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info

@@ -7,8 +7,8 @@ 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 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/system_incompatible_module_version_test.info

@@ -5,8 +5,8 @@ version = 1.0
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/system_test.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = system_test.module
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/taxonomy_test.info

@@ -6,8 +6,8 @@ core = 7.x
 hidden = TRUE
 dependencies[] = taxonomy
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/theme_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/themes/test_basetheme/test_basetheme.info

@@ -6,8 +6,8 @@ hidden = TRUE
 settings[basetheme_only] = base theme value
 settings[subtheme_override] = base theme value
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/themes/test_subtheme/test_subtheme.info

@@ -6,8 +6,8 @@ hidden = TRUE
 
 settings[subtheme_override] = subtheme value
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/themes/test_theme/test_theme.info

@@ -17,8 +17,8 @@ stylesheets[all][] = system.base.css
 
 settings[theme_test_setting] = default value
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/update_script_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/update_test_1.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/update_test_2.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/update_test_3.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/url_alter_test.info

@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/simpletest/tests/xmlrpc_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/statistics/statistics.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = statistics.test
 configure = admin/config/system/statistics
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/syslog/syslog.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = syslog.test
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

+ 3 - 3
modules/system/system.info

@@ -12,8 +12,8 @@ files[] = system.test
 required = TRUE
 configure = admin/config/system
 
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
 project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
 

Some files were not shown because too many files changed in this diff