From 0b6e1b50e5a68a2d43ffe4061d4fac9a914df1b5 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 20 Feb 2013 17:25:19 -0600
Subject: [PATCH] [gh-618] Upgrade Drupal Core to 7.20
---
CHANGELOG.txt | 5 ++
includes/bootstrap.inc | 2 +-
modules/aggregator/aggregator.info | 6 +--
modules/aggregator/tests/aggregator_test.info | 6 +--
modules/block/block.info | 6 +--
modules/block/tests/block_test.info | 6 +--
.../block_test_theme/block_test_theme.info | 6 +--
modules/blog/blog.info | 6 +--
modules/book/book.info | 6 +--
modules/color/color.info | 6 +--
modules/comment/comment.info | 6 +--
modules/contact/contact.info | 6 +--
modules/contextual/contextual.info | 6 +--
modules/dashboard/dashboard.info | 6 +--
modules/dblog/dblog.info | 6 +--
modules/field/field.info | 6 +--
.../field_sql_storage/field_sql_storage.info | 6 +--
modules/field/modules/list/list.info | 6 +--
.../field/modules/list/tests/list_test.info | 6 +--
modules/field/modules/number/number.info | 6 +--
modules/field/modules/options/options.info | 6 +--
modules/field/modules/text/text.info | 6 +--
modules/field/tests/field_test.info | 6 +--
modules/field_ui/field_ui.info | 6 +--
modules/file/file.info | 6 +--
modules/file/tests/file_module_test.info | 6 +--
modules/filter/filter.info | 6 +--
modules/forum/forum.info | 6 +--
modules/help/help.info | 6 +--
modules/image/image.info | 6 +--
modules/image/image.module | 54 ++++++++++++++++---
modules/image/image.test | 45 ++++++++++------
modules/image/tests/image_module_test.info | 6 +--
modules/locale/locale.info | 6 +--
modules/locale/tests/locale_test.info | 6 +--
modules/menu/menu.info | 6 +--
modules/node/node.info | 6 +--
modules/node/tests/node_access_test.info | 6 +--
modules/node/tests/node_test.info | 6 +--
modules/node/tests/node_test_exception.info | 6 +--
modules/openid/openid.info | 6 +--
modules/openid/tests/openid_test.info | 6 +--
modules/overlay/overlay.info | 6 +--
modules/path/path.info | 6 +--
modules/php/php.info | 6 +--
modules/poll/poll.info | 6 +--
modules/profile/profile.info | 6 +--
modules/rdf/rdf.info | 6 +--
modules/rdf/tests/rdf_test.info | 6 +--
modules/search/search.info | 6 +--
.../search/tests/search_embedded_form.info | 6 +--
modules/search/tests/search_extra_type.info | 6 +--
modules/shortcut/shortcut.info | 6 +--
modules/simpletest/simpletest.info | 6 +--
.../simpletest/tests/actions_loop_test.info | 6 +--
modules/simpletest/tests/ajax_forms_test.info | 6 +--
modules/simpletest/tests/ajax_test.info | 6 +--
modules/simpletest/tests/batch_test.info | 6 +--
modules/simpletest/tests/common_test.info | 6 +--
.../tests/common_test_cron_helper.info | 6 +--
modules/simpletest/tests/database_test.info | 6 +--
...drupal_system_listing_compatible_test.info | 6 +--
...upal_system_listing_incompatible_test.info | 6 +--
.../simpletest/tests/entity_cache_test.info | 6 +--
.../tests/entity_cache_test_dependency.info | 6 +--
.../tests/entity_crud_hook_test.info | 6 +--
.../tests/entity_query_access_test.info | 6 +--
modules/simpletest/tests/error_test.info | 6 +--
modules/simpletest/tests/file_test.info | 6 +--
modules/simpletest/tests/filter_test.info | 6 +--
modules/simpletest/tests/form_test.info | 6 +--
modules/simpletest/tests/image_test.info | 6 +--
modules/simpletest/tests/menu_test.info | 6 +--
modules/simpletest/tests/module_test.info | 6 +--
modules/simpletest/tests/path_test.info | 6 +--
.../simpletest/tests/requirements1_test.info | 6 +--
.../simpletest/tests/requirements2_test.info | 6 +--
modules/simpletest/tests/session_test.info | 6 +--
.../tests/system_dependencies_test.info | 6 +--
...atible_core_version_dependencies_test.info | 6 +--
...system_incompatible_core_version_test.info | 6 +--
...ible_module_version_dependencies_test.info | 6 +--
...stem_incompatible_module_version_test.info | 6 +--
modules/simpletest/tests/system_test.info | 6 +--
modules/simpletest/tests/taxonomy_test.info | 6 +--
modules/simpletest/tests/theme_test.info | 6 +--
.../themes/test_basetheme/test_basetheme.info | 6 +--
.../themes/test_subtheme/test_subtheme.info | 6 +--
.../tests/themes/test_theme/test_theme.info | 6 +--
.../simpletest/tests/update_script_test.info | 6 +--
modules/simpletest/tests/update_test_1.info | 6 +--
modules/simpletest/tests/update_test_2.info | 6 +--
modules/simpletest/tests/update_test_3.info | 6 +--
modules/simpletest/tests/url_alter_test.info | 6 +--
modules/simpletest/tests/xmlrpc_test.info | 6 +--
modules/statistics/statistics.info | 6 +--
modules/syslog/syslog.info | 6 +--
modules/system/system.info | 6 +--
modules/taxonomy/taxonomy.info | 6 +--
modules/toolbar/toolbar.info | 6 +--
modules/tracker/tracker.info | 6 +--
.../translation/tests/translation_test.info | 6 +--
modules/translation/translation.info | 6 +--
modules/trigger/tests/trigger_test.info | 6 +--
modules/trigger/trigger.info | 6 +--
modules/update/tests/aaa_update_test.info | 6 +--
modules/update/tests/bbb_update_test.info | 6 +--
modules/update/tests/ccc_update_test.info | 6 +--
.../update_test_basetheme.info | 6 +--
.../update_test_subtheme.info | 6 +--
modules/update/tests/update_test.info | 6 +--
modules/update/update.info | 6 +--
modules/user/tests/user_form_test.info | 6 +--
modules/user/user.info | 6 +--
modules/user/user.test | 2 +-
profiles/minimal/minimal.info | 6 +--
profiles/standard/standard.info | 6 +--
...drupal_system_listing_compatible_test.info | 6 +--
...upal_system_listing_incompatible_test.info | 6 +--
profiles/testing/testing.info | 6 +--
themes/bartik/bartik.info | 6 +--
themes/garland/garland.info | 6 +--
themes/seven/seven.info | 6 +--
themes/stark/stark.info | 6 +--
124 files changed, 440 insertions(+), 382 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 08acf95a7..750aabb24 100644
--- a/CHANGELOG.txt
+++ b/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.
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index c49ccfe50..0c70cbda4 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.19');
+define('VERSION', '7.20');
/**
* Core API compatibility.
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index 252b19494..557d055fe 100644
--- a/modules/aggregator/aggregator.info
+++ b/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"
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index 8debb68d6..00836d111 100644
--- a/modules/aggregator/tests/aggregator_test.info
+++ b/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"
diff --git a/modules/block/block.info b/modules/block/block.info
index 9b19636b2..2ffb62840 100644
--- a/modules/block/block.info
+++ b/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"
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index 589df56ef..e70f39187 100644
--- a/modules/block/tests/block_test.info
+++ b/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"
diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info
index ca7b9c1c5..65e240e30 100644
--- a/modules/block/tests/themes/block_test_theme/block_test_theme.info
+++ b/modules/block/tests/themes/block_test_theme/block_test_theme.info
@@ -13,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"
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index e015c8d0a..9dc8f3ba2 100644
--- a/modules/blog/blog.info
+++ b/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"
diff --git a/modules/book/book.info b/modules/book/book.info
index b7ef56eac..eb920e104 100644
--- a/modules/book/book.info
+++ b/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"
diff --git a/modules/color/color.info b/modules/color/color.info
index e6fa50b89..3da8cc69d 100644
--- a/modules/color/color.info
+++ b/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"
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index b17a4d58f..bef4c558a 100644
--- a/modules/comment/comment.info
+++ b/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"
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 4d5775c83..3c317c004 100644
--- a/modules/contact/contact.info
+++ b/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"
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index 271d95b50..f2aa02160 100644
--- a/modules/contextual/contextual.info
+++ b/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"
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index 822e13d8e..ada3e53c7 100644
--- a/modules/dashboard/dashboard.info
+++ b/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"
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index ea05c6f53..5e3504839 100644
--- a/modules/dblog/dblog.info
+++ b/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"
diff --git a/modules/field/field.info b/modules/field/field.info
index cf00c2d38..223587ca5 100644
--- a/modules/field/field.info
+++ b/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"
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info
index 702ed4085..ab4cf34b2 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.info
+++ b/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"
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index a8d83d86a..a84296cca 100644
--- a/modules/field/modules/list/list.info
+++ b/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"
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index e0fecc9ae..2e961dead 100644
--- a/modules/field/modules/list/tests/list_test.info
+++ b/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"
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index 9770d991c..74ba621ff 100644
--- a/modules/field/modules/number/number.info
+++ b/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"
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index b93804526..3e989d3aa 100644
--- a/modules/field/modules/options/options.info
+++ b/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"
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index 9968c8531..e09eaa79d 100644
--- a/modules/field/modules/text/text.info
+++ b/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"
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index 0e37017b1..c457fe97e 100644
--- a/modules/field/tests/field_test.info
+++ b/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"
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index 2bf6803f9..0957d1ec7 100644
--- a/modules/field_ui/field_ui.info
+++ b/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"
diff --git a/modules/file/file.info b/modules/file/file.info
index 60b130c3d..5a70a1e0a 100644
--- a/modules/file/file.info
+++ b/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"
diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
index afa457eae..4f74a9c4d 100644
--- a/modules/file/tests/file_module_test.info
+++ b/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"
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 89f419035..2c0b0fe2d 100644
--- a/modules/filter/filter.info
+++ b/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"
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index 13305845d..22c17758a 100644
--- a/modules/forum/forum.info
+++ b/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"
diff --git a/modules/help/help.info b/modules/help/help.info
index 673681f08..58562c097 100644
--- a/modules/help/help.info
+++ b/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"
diff --git a/modules/image/image.info b/modules/image/image.info
index a53514db2..2919d36fe 100644
--- a/modules/image/image.info
+++ b/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"
diff --git a/modules/image/image.module b/modules/image/image.module
index 07f489233..d7178ad7d 100644
--- a/modules/image/image.module
+++ b/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);
}
/**
diff --git a/modules/image/image.test b/modules/image/image.test
index 1ca846506..d4db2130b 100644
--- a/modules/image/image.test
+++ b/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.');
}
diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info
index 58f99cdac..7f4649320 100644
--- a/modules/image/tests/image_module_test.info
+++ b/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"
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
index f3f119ce6..147ce84f9 100644
--- a/modules/locale/locale.info
+++ b/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"
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index d213776cb..06c0eee8d 100644
--- a/modules/locale/tests/locale_test.info
+++ b/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"
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index a01130b85..16b08aef6 100644
--- a/modules/menu/menu.info
+++ b/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"
diff --git a/modules/node/node.info b/modules/node/node.info
index fa08d1264..26805f6d2 100644
--- a/modules/node/node.info
+++ b/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"
diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index 4e6299959..d620c7d01 100644
--- a/modules/node/tests/node_access_test.info
+++ b/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"
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index 625b1a1b5..fe157e0a2 100644
--- a/modules/node/tests/node_test.info
+++ b/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"
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index b2c8a9d60..c4f42704d 100644
--- a/modules/node/tests/node_test_exception.info
+++ b/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"
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index bdd3c4763..bd63243a2 100644
--- a/modules/openid/openid.info
+++ b/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"
diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index a3fd263eb..b562e5ce0 100644
--- a/modules/openid/tests/openid_test.info
+++ b/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"
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index a4569e8dc..73bfc1b28 100644
--- a/modules/overlay/overlay.info
+++ b/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"
diff --git a/modules/path/path.info b/modules/path/path.info
index 9c704df18..52d277a93 100644
--- a/modules/path/path.info
+++ b/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"
diff --git a/modules/php/php.info b/modules/php/php.info
index 071047fea..bcd8a9202 100644
--- a/modules/php/php.info
+++ b/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"
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index bd0bd5975..0033ec01e 100644
--- a/modules/poll/poll.info
+++ b/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"
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index bb84f75e0..a60c2a207 100644
--- a/modules/profile/profile.info
+++ b/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"
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index 59b505fd0..322527ea6 100644
--- a/modules/rdf/rdf.info
+++ b/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"
diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index 36c736499..88ebd8252 100644
--- a/modules/rdf/tests/rdf_test.info
+++ b/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"
diff --git a/modules/search/search.info b/modules/search/search.info
index 1ce630732..32a4999af 100644
--- a/modules/search/search.info
+++ b/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"
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 1a6f3cba1..10a15ff6c 100644
--- a/modules/search/tests/search_embedded_form.info
+++ b/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"
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index 94f92fb29..19171485a 100644
--- a/modules/search/tests/search_extra_type.info
+++ b/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"
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index 93584830c..00a88e03f 100644
--- a/modules/shortcut/shortcut.info
+++ b/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"
diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index 1dd2fef12..c3d3e9273 100644
--- a/modules/simpletest/simpletest.info
+++ b/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"
diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index 0c2fc0461..e684a3b59 100644
--- a/modules/simpletest/tests/actions_loop_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index 911566d20..d96d7dec0 100644
--- a/modules/simpletest/tests/ajax_forms_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index 90bf1ebb3..d48c68f39 100644
--- a/modules/simpletest/tests/ajax_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index 5c00bc2c0..c03fb4d5e 100644
--- a/modules/simpletest/tests/batch_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index ba9517e10..1702d7330 100644
--- a/modules/simpletest/tests/common_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/common_test_cron_helper.info b/modules/simpletest/tests/common_test_cron_helper.info
index a5501e062..966212210 100644
--- a/modules/simpletest/tests/common_test_cron_helper.info
+++ b/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"
diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index 9f3a58d1c..8129705b6 100644
--- a/modules/simpletest/tests/database_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index eb6d7d8b5..7918eae31 100644
--- a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -5,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"
diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 05cdd1f69..73120f65a 100644
--- a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -5,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"
diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info
index dd500154b..5cf393f63 100644
--- a/modules/simpletest/tests/entity_cache_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info
index e5a20fb36..22ebd0aa5 100644
--- a/modules/simpletest/tests/entity_cache_test_dependency.info
+++ b/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"
diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info
index c4a612865..bede4cd16 100644
--- a/modules/simpletest/tests/entity_crud_hook_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/entity_query_access_test.info b/modules/simpletest/tests/entity_query_access_test.info
index 0d8ac9e51..10c6db2ba 100644
--- a/modules/simpletest/tests/entity_query_access_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info
index 123fcea09..62ed6574b 100644
--- a/modules/simpletest/tests/error_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/file_test.info b/modules/simpletest/tests/file_test.info
index 367f2eeee..1f9be7f32 100644
--- a/modules/simpletest/tests/file_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info
index 873a21af7..c6c5a3c5d 100644
--- a/modules/simpletest/tests/filter_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index e1fbc1c42..04abff4a0 100644
--- a/modules/simpletest/tests/form_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index 201d113e6..8dbb2814c 100644
--- a/modules/simpletest/tests/image_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info
index b35d57b53..6c9514dcd 100644
--- a/modules/simpletest/tests/menu_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info
index 9d74f0adc..7f4ba7d62 100644
--- a/modules/simpletest/tests/module_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/path_test.info b/modules/simpletest/tests/path_test.info
index 0e49736ff..d2cab0a17 100644
--- a/modules/simpletest/tests/path_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info
index 6d7bdb22b..13e388f63 100644
--- a/modules/simpletest/tests/requirements1_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info
index f22562a3a..371f1f105 100644
--- a/modules/simpletest/tests/requirements2_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info
index 87b1f4a57..d1c610172 100644
--- a/modules/simpletest/tests/session_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info
index ce7bb02f8..a6efc8dd1 100644
--- a/modules/simpletest/tests/system_dependencies_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
index 372a0b9e3..bda7979bc 100644
--- a/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/system_incompatible_core_version_test.info b/modules/simpletest/tests/system_incompatible_core_version_test.info
index 4f5679d28..a9de42e2f 100644
--- a/modules/simpletest/tests/system_incompatible_core_version_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
index c1c18d43b..1f58f6385 100644
--- a/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info
index 5af3b5ee6..ea9a42b1e 100644
--- a/modules/simpletest/tests/system_incompatible_module_version_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/system_test.info b/modules/simpletest/tests/system_test.info
index 98de621e4..068755b7a 100644
--- a/modules/simpletest/tests/system_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info
index 18034473f..42ed05f2b 100644
--- a/modules/simpletest/tests/taxonomy_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info
index 83adcfcd6..d05453a7f 100644
--- a/modules/simpletest/tests/theme_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
index 2cf64aa94..cc583f0f2 100644
--- a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
+++ b/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"
diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
index 34154f557..e744045c7 100644
--- a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
+++ b/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"
diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info
index 5d527da4d..ae0447710 100644
--- a/modules/simpletest/tests/themes/test_theme/test_theme.info
+++ b/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"
diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info
index ada207a3d..ed8c96766 100644
--- a/modules/simpletest/tests/update_script_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info
index 5e80c6519..40dad0615 100644
--- a/modules/simpletest/tests/update_test_1.info
+++ b/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"
diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info
index 5e80c6519..40dad0615 100644
--- a/modules/simpletest/tests/update_test_2.info
+++ b/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"
diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info
index 5e80c6519..40dad0615 100644
--- a/modules/simpletest/tests/update_test_3.info
+++ b/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"
diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info
index 94d672a63..c5691f47b 100644
--- a/modules/simpletest/tests/url_alter_test.info
+++ b/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"
diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info
index ff0d1559f..ac5af5c58 100644
--- a/modules/simpletest/tests/xmlrpc_test.info
+++ b/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"
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index ebdfcbdac..f73dab155 100644
--- a/modules/statistics/statistics.info
+++ b/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"
diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info
index c3bb3328b..e0ea3740e 100644
--- a/modules/syslog/syslog.info
+++ b/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"
diff --git a/modules/system/system.info b/modules/system/system.info
index 1d42f18b0..dca4780e6 100644
--- a/modules/system/system.info
+++ b/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"
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index d62b8ef10..fa3363f04 100644
--- a/modules/taxonomy/taxonomy.info
+++ b/modules/taxonomy/taxonomy.info
@@ -8,8 +8,8 @@ files[] = taxonomy.module
files[] = taxonomy.test
configure = admin/structure/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"
diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info
index 7576972b1..c0aa88b6f 100644
--- a/modules/toolbar/toolbar.info
+++ b/modules/toolbar/toolbar.info
@@ -4,8 +4,8 @@ core = 7.x
package = Core
version = VERSION
-; 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"
diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index 16c6a1d89..43422079a 100644
--- a/modules/tracker/tracker.info
+++ b/modules/tracker/tracker.info
@@ -6,8 +6,8 @@ version = VERSION
core = 7.x
files[] = tracker.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"
diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info
index aa84109a2..d84803ecd 100644
--- a/modules/translation/tests/translation_test.info
+++ b/modules/translation/tests/translation_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"
diff --git a/modules/translation/translation.info b/modules/translation/translation.info
index a9d7d6799..ca65d35b1 100644
--- a/modules/translation/translation.info
+++ b/modules/translation/translation.info
@@ -6,8 +6,8 @@ version = VERSION
core = 7.x
files[] = translation.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"
diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info
index d34da4c59..f81749a24 100644
--- a/modules/trigger/tests/trigger_test.info
+++ b/modules/trigger/tests/trigger_test.info
@@ -4,8 +4,8 @@ package = Testing
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"
diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info
index fe18dae3a..0586f45a0 100644
--- a/modules/trigger/trigger.info
+++ b/modules/trigger/trigger.info
@@ -6,8 +6,8 @@ core = 7.x
files[] = trigger.test
configure = admin/structure/trigger
-; 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"
diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
index 1043ad5c5..70292932e 100644
--- a/modules/update/tests/aaa_update_test.info
+++ b/modules/update/tests/aaa_update_test.info
@@ -4,8 +4,8 @@ package = Testing
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"
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
index 89204cba2..2e8454644 100644
--- a/modules/update/tests/bbb_update_test.info
+++ b/modules/update/tests/bbb_update_test.info
@@ -4,8 +4,8 @@ package = Testing
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"
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
index fa96e11e9..b8fd231e6 100644
--- a/modules/update/tests/ccc_update_test.info
+++ b/modules/update/tests/ccc_update_test.info
@@ -4,8 +4,8 @@ package = Testing
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"
diff --git a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
index d3f29920f..3c5fa3233 100644
--- a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
+++ b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
@@ -3,8 +3,8 @@ description = Test theme which acts as a base theme for other test subthemes.
core = 7.x
hidden = TRUE
-; Information added by drupal.org packaging script on 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"
diff --git a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
index 68a81e61a..7f2393899 100644
--- a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
+++ b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
@@ -4,8 +4,8 @@ core = 7.x
base theme = update_test_basetheme
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"
diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info
index 1c17b944f..8cec9192e 100644
--- a/modules/update/tests/update_test.info
+++ b/modules/update/tests/update_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"
diff --git a/modules/update/update.info b/modules/update/update.info
index c146e8c3a..fef63c5dd 100644
--- a/modules/update/update.info
+++ b/modules/update/update.info
@@ -6,8 +6,8 @@ core = 7.x
files[] = update.test
configure = admin/reports/updates/settings
-; 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"
diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info
index 43f4afd39..ff4cd7641 100644
--- a/modules/user/tests/user_form_test.info
+++ b/modules/user/tests/user_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"
diff --git a/modules/user/user.info b/modules/user/user.info
index 36aa73955..eef6b4502 100644
--- a/modules/user/user.info
+++ b/modules/user/user.info
@@ -9,8 +9,8 @@ required = TRUE
configure = admin/config/people
stylesheets[all][] = user.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"
diff --git a/modules/user/user.test b/modules/user/user.test
index 123beee6c..26e93ed3c 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -968,7 +968,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
$this->assertRaw($text, t('Image was resized.'));
$alt = t("@user's picture", array('@user' => format_username($this->user)));
$style = variable_get('user_picture_style', '');
- $this->assertRaw(image_style_url($style, $pic_path), t("Image is displayed in user's edit page"));
+ $this->assertRaw(check_plain(image_style_url($style, $pic_path)), t("Image is displayed in user's edit page"));
// Check if file is located in proper directory.
$this->assertTrue(is_file($pic_path), t("File is located in proper directory"));
diff --git a/profiles/minimal/minimal.info b/profiles/minimal/minimal.info
index 356d05254..04fcc9312 100644
--- a/profiles/minimal/minimal.info
+++ b/profiles/minimal/minimal.info
@@ -5,8 +5,8 @@ core = 7.x
dependencies[] = block
dependencies[] = dblog
-; 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"
diff --git a/profiles/standard/standard.info b/profiles/standard/standard.info
index 74ce65f39..9eb1e66cf 100644
--- a/profiles/standard/standard.info
+++ b/profiles/standard/standard.info
@@ -24,8 +24,8 @@ dependencies[] = field_ui
dependencies[] = file
dependencies[] = rdf
-; 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"
diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index e1abb28d8..27031076c 100644
--- a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -6,8 +6,8 @@ core = 7.x
hidden = TRUE
files[] = drupal_system_listing_compatible_test.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"
diff --git a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 4a1f0ae06..3fb12b5ec 100644
--- a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -8,8 +8,8 @@ version = VERSION
core = 6.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"
diff --git a/profiles/testing/testing.info b/profiles/testing/testing.info
index fdd5b461c..77ac5ef3e 100644
--- a/profiles/testing/testing.info
+++ b/profiles/testing/testing.info
@@ -4,8 +4,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"
diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info
index 1dfa5de23..bf0d33dff 100644
--- a/themes/bartik/bartik.info
+++ b/themes/bartik/bartik.info
@@ -34,8 +34,8 @@ regions[footer] = Footer
settings[shortcut_module_link] = 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"
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index 9eeafba98..38dad5ae2 100644
--- a/themes/garland/garland.info
+++ b/themes/garland/garland.info
@@ -7,8 +7,8 @@ stylesheets[all][] = style.css
stylesheets[print][] = print.css
settings[garland_width] = fluid
-; 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"
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index b8b4aff5e..99194dd88 100644
--- a/themes/seven/seven.info
+++ b/themes/seven/seven.info
@@ -13,8 +13,8 @@ regions[page_bottom] = Page bottom
regions[sidebar_first] = First sidebar
regions_hidden[] = sidebar_first
-; 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"
diff --git a/themes/stark/stark.info b/themes/stark/stark.info
index 5292adcc4..240215237 100644
--- a/themes/stark/stark.info
+++ b/themes/stark/stark.info
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
stylesheets[all][] = layout.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"
--
GitLab