diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 750aabb24effe7ebc1fc61316d3317f33e3b95a2..69d94de730f3401188fafbcb1b15dcc61fb72964 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,9 @@
+Drupal 7.21, 2013-03-06
+-----------------------
+- Allowed sites using the 'image_allow_insecure_derivatives' variable to still
+ have partial protection from the security issues fixed in Drupal 7.20.
+
Drupal 7.20, 2013-02-20
-----------------------
- Fixed security issues (denial of service). See SA-CORE-2013-002.
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 0c70cbda4142f44007057550608f68b2f9f09792..92ba80cf2b06447b4f9119fd30bc7dfb959b3877 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.20');
+define('VERSION', '7.21');
/**
* Core API compatibility.
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index 557d055fe215aefd10e6432a53aae39ac90eca2e..53683b694fde09f17d15e5e1376d401404e67f0b 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index 00836d11162a05e711d7b63fb6804749f5fe8ae3..d1e0bcc6483c1c4ec4f534f2bfd2728667000a56 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/block/block.info b/modules/block/block.info
index 2ffb62840e6996ce460fba0872a6d8cdfe4681c8..470a37831db88ef2a3111bc44dd71ca4458f22a1 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index e70f39187305cac70a25993bbd2e857a9b7f72bf..d5a6af3c6c80f83da3fc002ce3a98db4fbd5424f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 65e240e3085658770e1e26129c4f8ad1641732d4..46291e41b29d2bec32137ef7307866dbaf314a9f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index 9dc8f3ba28ed4a119c61d215f36a9dd680166085..16ef24aaf2ad42f5995185c595fa3f4bb9ba67bf 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/book/book.info b/modules/book/book.info
index eb920e10473a13e5c379eb9294161c688afb1641..4a96b2cbed65cf148b84d20976f041aab72e59ed 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/color/color.info b/modules/color/color.info
index 3da8cc69d65976f808ca9ab7bd802e74fd347317..4e70155277a24d99c11b8cf29dfb306c1bf79fb2 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index bef4c558a0c373020e00ad7ab574ec3107d63bdd..fd2f91bf0a7de5be11893148ce6c67c168c209ff 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 3c317c004ef26f801235a8cb4cfca826f0e631ec..6a355df00c052f7fff504d7c98c5198c94ba5172 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index f2aa02160650e15f551104b715703e64e3e0b6c5..cd3ba08b731f6a242ee2e057a5a9f8501e6beb17 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index ada3e53c7cac47f4943a0cb8c7ac3e66bda9050e..448fdcc9cb05473c06e0b0b484b8dfdb42fbd693 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 5e3504839882b6aa7c93e82d0fca6c935d4c0d09..1e36fc7fff069c44b3de0d3a01467f2ee95a7113 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/field.info b/modules/field/field.info
index 223587ca593be9eb9a8e1a2e7bb508c863fde14d..c194d6e57202ae2561ea97057cd3d7bf71cd69f6 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 ab4cf34b27872c576461b1bd87ef30d2f4dd0840..3dec0c44fd1471b0665f0372e469d6fd02a802a1 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index a84296cca1f34bb2ac727672452e93a4e43a7be7..ee82df0eb058bec6afd3f44a69cfb282a75d490a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index 2e961dead3dd83b8d75a2e1b8ac3f94fc275fee3..4020c37ba2c16e317afffa87efb889e05e475bad 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index 74ba621ff68590004a525f04ab4a4f6971ad1d92..efc5403795849c137a702f4ed3144bdf694beb7b 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index 3e989d3aa7e1405b6485a1f2c4e0fd46c4b4676f..61cd19de7cbcf38a55bcd58b1f838b792d6e251a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index e09eaa79dc7e2b054e5be13e62a01f4f6a2348c4..15f87cebdd7fefdf96d4d0c3ac170646b1ad5fc3 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index c457fe97e0acfddbe981b00c111d61e17b936377..81010dc1dd4768f1f1bb1794b87b4d0eeaa09148 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index 0957d1ec7535189243a3e3eb200e1c0ac88ba416..4497bcb08140dfae71edde54b0719d6d32c34189 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/file/file.info b/modules/file/file.info
index 5a70a1e0ae487ca858ecca5796f9f395197f2723..25b90339cf0cb2a3a420937cf84df6fdd277b71d 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
index 4f74a9c4d82b85a8c088f8daf6e14c4bb27221e8..7b2fcbb492f987ae26f2b587fba49dc192b0ec13 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 2c0b0fe2d62d82a8e546920aac9d024cddf97739..baf12a9f312ece288300312a5436f9ef1f800505 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index 22c17758a1e60322227d66b0d31e4f75d4cf3f1d..b2fac60787f426e2f171fa1fb8a151880753b3db 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/help/help.info b/modules/help/help.info
index 58562c0975bfbfbd7d3ecd99cc6b182a99261f05..91c34eeb8fd010c4d6ecfde6a863616ea4a2164f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/image/image.info b/modules/image/image.info
index 2919d36fe766f863098674d80ff00f00de7d8cb5..fdbc98c045c12426b5341a9c9a3be0e3e4ef4984 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/image/image.module b/modules/image/image.module
index d7178ad7dfbe8bb2cfa3cae4c1089f21f40045c9..a9cc1a545938c483d1706a538a26606a95b84cb9 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -780,9 +780,11 @@ function image_style_deliver($style, $scheme) {
// 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.)
+ // site's vulnerability to denial-of-service attacks. To prevent this
+ // variable from leaving the site vulnerable to the most serious attacks, a
+ // token is always required when a derivative of a derivative is requested.)
$valid = !empty($style) && file_stream_wrapper_valid_scheme($scheme);
- if (!variable_get('image_allow_insecure_derivatives', FALSE)) {
+ if (!variable_get('image_allow_insecure_derivatives', FALSE) || strpos(ltrim($target, '\/'), 'styles/') === 0) {
$valid = $valid && isset($_GET[IMAGE_DERIVATIVE_TOKEN]) && $_GET[IMAGE_DERIVATIVE_TOKEN] === image_style_path_token($style['name'], $scheme . '://' . $target);
}
if (!$valid) {
@@ -867,6 +869,11 @@ function image_style_deliver($style, $scheme) {
* @see image_style_load()
*/
function image_style_create_derivative($style, $source, $destination) {
+ // If the source file doesn't exist, return FALSE without creating folders.
+ if (!$image = image_load($source)) {
+ return FALSE;
+ }
+
// Get the folder for the final location of this style.
$directory = drupal_dirname($destination);
@@ -876,10 +883,6 @@ function image_style_create_derivative($style, $source, $destination) {
return FALSE;
}
- if (!$image = image_load($source)) {
- return FALSE;
- }
-
foreach ($style['effects'] as $effect) {
image_effect_apply($image, $effect);
}
diff --git a/modules/image/image.test b/modules/image/image.test
index d4db2130b6d467bc0cb48e766d7bebe582514b68..25fddf64c131861854d048946e338bc971282d5e 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -249,6 +249,51 @@ class ImageStylesPathAndUrlTestCase extends DrupalWebTestCase {
$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.');
}
+
+ // Allow insecure image derivatives to be created for the remainder of this
+ // test.
+ variable_set('image_allow_insecure_derivatives', TRUE);
+
+ // Create another working copy of the file.
+ $files = $this->drupalGetTestFiles('image');
+ $file = array_shift($files);
+ $image_info = image_get_info($file->uri);
+ $original_uri = file_unmanaged_copy($file->uri, $scheme . '://', FILE_EXISTS_RENAME);
+ // Let the image_module_test module know about this file, so it can claim
+ // ownership in hook_file_download().
+ variable_set('image_module_test_file_download', $original_uri);
+
+ // Get the URL of a file that has not been generated and try to create it.
+ $generated_uri = image_style_path($this->style_name, $original_uri);
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $generate_url = image_style_url($this->style_name, $original_uri);
+
+ // Check that the image is accessible even without the security token.
+ $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $generate_url));
+ $this->assertResponse(200, 'Image was accessible at the URL with a missing token.');
+
+ // Check that a security token is still required when generating a second
+ // image derivative using the first one as a source.
+ $nested_uri = image_style_path($this->style_name, $generated_uri);
+ $nested_url = image_style_url($this->style_name, $generated_uri);
+ $nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $nested_url);
+ $this->drupalGet($nested_url_with_wrong_token);
+ $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token.');
+ // Check that this restriction cannot be bypassed by adding extra slashes
+ // to the URL.
+ $this->drupalGet(substr_replace($nested_url_with_wrong_token, '//styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
+ $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with an extra forward slash in the URL.');
+ $this->drupalGet(substr_replace($nested_url_with_wrong_token, '/\styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
+ $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with an extra backslash in the URL.');
+ // Make sure the image can still be generated if a correct token is used.
+ $this->drupalGet($nested_url);
+ $this->assertResponse(200, 'Image was accessible when a correct token was provided in the URL.');
+
+ // Check that requesting a nonexistent image does not create any new
+ // directories in the file system.
+ $directory = $scheme . '://styles/' . $this->style_name . '/' . $scheme . '/' . $this->randomName();
+ $this->drupalGet(file_create_url($directory . '/' . $this->randomName()));
+ $this->assertFalse(file_exists($directory), 'New directory was not created in the filesystem when requesting an unauthorized image.');
}
}
diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info
index 7f4649320c3a94221fe4ae54966fe37d7de5b71d..40b45abf43a9e4df72bbd81768c3a1aa4c9b5941 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
index 147ce84f9eb0b702b45bb5675ee09161bec25f6d..fcacaec5bc0dc4caef8abdb58246964fa51c4157 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index 06c0eee8d9bce387a1b9ddec80fbf28253b23f8a..afad3657800f38af070bbd364c03f46eae4e88f7 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 16b08aef66ba8ef5c9ad7703fc3fdd1b3217bbcb..f4e0cc9596d96c94cfdd7bfd13546db671dbb670 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/node/node.info b/modules/node/node.info
index 26805f6d2e573897b316d2a858bed24e8a5a3577..c02a537dd627e0b36b3fd6de7c7cccb03fe8e597 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index d620c7d014461a08b331d5f3cafbb1760609ae7c..bb7a5a78f8123038947119bc318f46f907046fe6 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index fe157e0a25ba434f2df391e5c838be243dfc62eb..005bb4fa5ce11d08072c9b503b349844ba2a2133 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index c4f42704df3c85c8e896b6cdddef34ed19d52f59..afd1ec761d6775ab6704a8bcc517d1b1a46a0935 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index bd63243a236a1844219c3065cfd3ad16f3aa0dc1..e5ff5015a41a6427801d911bba178cd17e967692 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index b562e5ce0e18847730c74cf78789e9040f6ce2dd..0205ca82a0f992797c32d8528fddfdbf28ec9347 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index 73bfc1b2831296481a2fd590ed1ead0ed6490e43..6dd4b950ec500c023bbbc7705e083cbd092369c9 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/path/path.info b/modules/path/path.info
index 52d277a931a44821acb432291efcc864b8a7f6b7..4abfa036bb58a78a83bbb2655ac250ed2bfebd32 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/php/php.info b/modules/php/php.info
index bcd8a92021a26a3e5b9cbdbd5e39e5a6e6217dbf..c5e57d5cba14e4145d400a31596eff782316a368 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index 0033ec01e76b7825535bb7d97e7bd9aadab74a93..2ae2ac2a5b6e553cc47b8831398ac9b3a784f849 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index a60c2a20780ef9d10034bde02cd1a9f335449641..4867fd3ec06726cd01e9d0b1a98bf629cf8463ab 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index 322527ea629eae054f840d007d3bc7c7a555e3e9..2877b2d0e165f0e40451687e4d4e234ecfef6fa2 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index 88ebd82528bc0f5df9dcacb9a16abd1e3a434669..fb18967d9f3fe8e8ec4302a9adbc3135795be60a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/search/search.info b/modules/search/search.info
index 32a4999afd891549b8fd76b020cef7638c8857da..780c52f8daf0948ca673fe7334719f267589a386 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 10a15ff6c5fa177cd82f829ee6c6ef0908f0029d..1ea22344c3480eebb16b6a0876f0183b18c30982 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index 19171485a0c7f81b0f5417ff18a745ec7e372b10..fce90a5d59ffdb4ef809dbd6885f9024aeded5e7 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index 00a88e03f308d597f8d0b4e7b29e62519aa4ad6d..e27160ce03d77066f3a1a7f58c93da188180c9d8 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index c3d3e927309227ad2551a4460b131b1b0dfe484c..687f2368df7f5ae7fca41d272951707b329a53e6 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index e684a3b59593b2019b1262f2f6a5099af8714267..bd440bfbf96c5ab8380a5c2800006e639775640e 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index d96d7dec00379abfdaf6bcad5a38339a3644b9c7..19ff8a18f375b12f2d5604d1c0a266c2dc0277f8 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index d48c68f39c674e9b6f657881a1216ba95068a276..042426df26c234ccf1a41344f51721ca6713ab34 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index c03fb4d5ec05d0fb962eb32026eb74d6d5c8f82c..c4e00dd7b9bc2f35f37fef05096de6adb267ccac 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index 1702d733039322d57c98e09881b03652c31f38d6..aec732bc26ed0a4f4f8962981b7fbe50be6057b5 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/common_test_cron_helper.info b/modules/simpletest/tests/common_test_cron_helper.info
index 966212210a260a1c17c1c9b6fe8fdaf88e330f4e..3834dfa3d403b5f322b0e8f67799202e38dc319f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index 8129705b6f1a6e665d0d6b19beb182a25b1b7949..a21a08a854d649339019a752f5be41bdcf78e36e 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 7918eae31be2dfdd62232b530c0229a6b5147cd3..ee0ce89022db56138519a5ee27150c190dc1cc08 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 73120f65af218f13bc0ea9ee15c0077e2b563e14..225e5165e1fbe81d79fb1c21b75123e8f46bebe6 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info
index 5cf393f636b4a04e087cac43103293bf025db54f..f9249fc53351558d2441d4598cc00027269f7067 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info
index 22ebd0aa50ad877af25664f4b232d428c4c82a61..b03e24438fed693a6ce7947275c006a709e017c7 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info
index bede4cd167c171a7134a9b3484a35b1815544b69..a27e9ebeffba8fa75b433dfbf7f1c404c81a4536 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/entity_query_access_test.info b/modules/simpletest/tests/entity_query_access_test.info
index 10c6db2ba788ea004f0a5a833bbdc8f97d95d8b7..396f07e01075974f602b126fbef7451564e0ae0a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info
index 62ed6574b886c65b482e79c344ea271adf621007..e009ed4b8b4b5b049354a4d916c40e4c590c2b2b 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/file_test.info b/modules/simpletest/tests/file_test.info
index 1f9be7f32e37111eb5cd90e760ebaf577cd8568b..047e5a85701ad8b89d2dd0ec29e0251e5d5e594b 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info
index c6c5a3c5d2a9a0b800229cb76673e1d8ffc260f0..dd95f92b14a9bbbe39f5832318a95210b7180109 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index 04abff4a08184b37f7c50bce7b2152ff0b1e2435..d86866370c815b55962194b595514be6f6f5d718 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index 8dbb2814c60d9b9af7a0bd331f9a04afec250b7e..50d5158156159a3ceab2c0f5b0cbec05c1cbff5a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info
index 6c9514dcdde5dec541a8bc1f1828ff30931e6a39..404cd8de97002cfa0b6c94caf6699f3b78ec9483 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info
index 7f4ba7d621e568574140eee3aaa47ea6b8000745..40eacedee768ba55332837f350e1a86156fac27c 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/path_test.info b/modules/simpletest/tests/path_test.info
index d2cab0a17b7d080c9ccf319f5cddd4249f1a126b..29b5f766857fb8150e5f36d72c40dd4f2828ef45 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info
index 13e388f63fdd4543d127571edd38bf3fb27008ea..d3ad0336e91a26e3776ebda744735418697538aa 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info
index 371f1f105c1aaacf5ddb8fce48bb513969df80b8..322b37efd7d9d01407ee48cadefdc61aa5d34ae2 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info
index d1c610172383c575a6dc852c703bfce8c06619bb..b4b5ea9a8b84bd1326325c55362f15b59c09a40e 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info
index a6efc8dd19fdd48d49470fc40db54f6629b813dd..f556fd8d2f89bae73dfabeeb2b81d972de86be3a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 bda7979bc5d628454edf6f870982a10854d8c3ba..a1701b0f6df3d2f060a40e0cac080e7147fd5b73 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/system_incompatible_core_version_test.info b/modules/simpletest/tests/system_incompatible_core_version_test.info
index a9de42e2f6a24e5d23623c3be1c9ed718d0056c4..8133d3b51f3242960d9e01c155bca6c48d97f430 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 1f58f638595c6d251c41b98db011bb687bbce9a5..e174c76dddce60080b95f576569264ed9a579104 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info
index ea9a42b1e46547f68f792528260d4a2f968bd2c5..558a4cb11c1e95bc69f183453b840a609d15e8c9 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/system_test.info b/modules/simpletest/tests/system_test.info
index 068755b7a76326eb8320c945b3127d8ec468e0e5..884a65aee04ab9ce7663f8febcc9aee35eed630d 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info
index 42ed05f2b9856731e20f4414e7ba20c1245e5993..6cf082379d7cfcf4339784a5b6692ad099b45fe0 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info
index d05453a7ffa46649ec101d7a463bc45ae8543a26..4ac92f8f983924cbbb36cbe4483f5cda1a2a542c 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
index cc583f0f26eeb3db9b6e3213797bba5c5e8a59c8..79dd3daefaa16bffe0d88588a37acc53e7c02722 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
index e744045c793d56120e67fb300b36874dc0202a67..cb63c50d518b5a44ccc5ea25379d588236312268 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info
index ae04477106ac94a8a554a1d77ab0d3c224477612..654495aea0a94c7ff26950d8fa0ff5ecaff82b54 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info
index ed8c9676652d7c4944faae3236a1e29c710bd8ca..62506580675ffbb41582345f4143acdb9bb67b67 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info
index 40dad06157f261e14e65e9466b690ea2cee09d27..640724d7f21c62b0d5f8cf94dc6a21e2c67fb18f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info
index 40dad06157f261e14e65e9466b690ea2cee09d27..640724d7f21c62b0d5f8cf94dc6a21e2c67fb18f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info
index 40dad06157f261e14e65e9466b690ea2cee09d27..640724d7f21c62b0d5f8cf94dc6a21e2c67fb18f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info
index c5691f47b0df9cc260ec8e7b6091ba097d2fdd21..c34b15e4a98a8b4fe5081c735ca76b5e001f7006 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info
index ac5af5c583c146211a548c89645276ecd383ce02..37b45dc50e485ad6f811a344ad643e63e8b6cae4 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index f73dab155822496765da71adf0ed9b43283e3edc..695bc64aaf1d4a21528a4c3d173f0a962c4c6a33 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info
index e0ea3740e6fd3406b9ced9cd5a3823c288ceb39e..b88a5f6c7e414d0e80d3ae49aee2230d0990f66a 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/system/system.info b/modules/system/system.info
index dca4780e6f191840aebc5710dead21d060d5b0af..533650297ca27f3eb1365b90436019b64f923f7d 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index fa3363f042e0d35f5ff24c4ce90ebbf82971b0a9..ec6e2e6c3fab8869c3fde5a828f67a8da6598e0d 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info
index c0aa88b6f2c58c2b7fd90f411f2e022367ed29bf..70d98c361861c0135a981accf7483af7aebcbaab 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index 43422079aed16931e9902f087f718d218430b484..0158a6593af64e314303cc4f977555702c5c6805 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info
index d84803ecdc5650d5478ea59366b36ca480085700..eed01c8b1d7513bae30a66bc01412dd948fae2c8 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/translation/translation.info b/modules/translation/translation.info
index ca65d35b1448943a52e366c760e351bf5c1f8d2b..b15e758d6121944a149ee7af125d1ef65ea0af48 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info
index f81749a2495145a8973121566987bdff22e2f524..278d6cdf0b5a5471ccd0b6fe804bc19a2d595d19 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info
index 0586f45a0105020c38e1209ae68aa8cccea244d2..fba5029b05c45ce27bf34f164cef56339392e3ca 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
index 70292932ece1176d4a4320ed293cf0b9f3e7786d..b0e8d6a12aedd0c6eb80eaf714e6003d1ac4b07f 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
index 2e8454644f217d38319270cbfdef8191ea625d39..e58911a9b9d5159cbd97e345d3d03040da86b507 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
index b8fd231e6120f5da2dfa859697147b5723adbec7..c852adfaf1820ebf0ff1a97b93c90aa099a2de40 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 3c5fa3233bf9986b2d977e3fe0cd66f2f02756ec..201ca82b45b0cbf0b5d09b667810c1e1fc9f3098 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 7f239389902dd176c728f8d0cd325b492c3ae725..e38839070fa60e84ddd26cd90670f5303a5112a4 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info
index 8cec9192e322ef54eabc043f93c17982a0724e7a..fea86aeb9a9df2389d173e700c09340712f06983 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/update/update.info b/modules/update/update.info
index fef63c5dd8afd8c5290cf384b68c982a8ad3112d..64183b38b57159d4c225a4e184ffa234f3ab6387 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info
index ff4cd7641d2cc18ce8392301e1c75269a30affbd..871e1fb9f453fb14e378e7cdbb217e7c10debfef 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/modules/user/user.info b/modules/user/user.info
index eef6b450218fdc4df6eb7f04c927079580675266..1430b68f989fc3571e4ed89350a4727c5fb80e88 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/profiles/minimal/minimal.info b/profiles/minimal/minimal.info
index 04fcc93121b87d7eafffaef2098df5e5daa911e9..657c2c124a59874f1d980e2f476af99f651f36af 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/profiles/standard/standard.info b/profiles/standard/standard.info
index 9eb1e66cf41b5c2598dec168d6026808144c18a5..2dc7d3ef367bbfe400912f68ddd67718b8912537 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 27031076c71c07afeecc9d3976a5bf508546654a..55bd3ffda9675ced1787cccd38a76342a672c544 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
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 3fb12b5ec99bd844221912e3b462624877d2766e..81fb29a187b65c29513c8cf73434155f6319a6d3 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/profiles/testing/testing.info b/profiles/testing/testing.info
index 77ac5ef3e075642e460bac8001a1289113fbf330..76b7e8a1a5c8ac0aadc98a64c1a1f89e48d824d1 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/sites/all/modules/unl_migration/unl_migration.php b/sites/all/modules/unl_migration/unl_migration.php
index d1a9b5b07933c59bf719ea19b3cc042d7655a29a..21fbb648558cf6cb19ba2e9f3fc711a0343afa2d 100755
--- a/sites/all/modules/unl_migration/unl_migration.php
+++ b/sites/all/modules/unl_migration/unl_migration.php
@@ -157,6 +157,20 @@ class Unl_Migration_Tool
private $_useLiferayCode = TRUE;
private $_logger;
+ private $_liferaySubsites = array(
+ 'cropwatch.unl.edu' => array('corn', 'drybeans', 'forages', 'organic', 'potato', 'sorghum', 'soybeans', 'wheat', 'bioenergy', 'insect', 'economics', 'ssm', 'soils', 'tillage', 'weed', 'varietytest', 'biotechnology', 'farmresearch', 'cropwatch-youth', 'militaryresources', 'gaps', 'sugarbeets'),
+ '4h.unl.edu' => array('extension-4-h-horse', '4hcamps', '4hcurriclum'),
+ 'animalscience.unl.edu' => array('fernando-lab', 'anscgenomics', 'rprb-lab', 'ruminutrition-lab'),
+ 'beef.unl.edu' => array('cattleproduction'),
+ 'biochem.unl.edu' => array('barycki', 'bailey', 'becker', 'adamec', 'wilson', 'biochem-fatttlab', 'simpson'),
+ 'bse.unl.edu' => array('p2guidelines'),
+ 'edmedia.unl.edu' => array('techtraining'),
+ 'food.unl.edu' => array('localfoods', 'allergy', 'fnh', 'preservation', 'fpc', 'safety', 'meatproducts', 'youth'),
+ 'ianrhome.unl.edu' => array('ianrinternational'),
+ 'water.unl.edu' => array('crops', 'cropswater', 'drinkingwater', 'drought', 'wildlife', 'hydrology', 'lakes', 'landscapes', 'landscapewater', 'laweconomics', 'manure', 'propertydesign', 'research', 'sewage', 'students', 'watershed', 'wells', 'wetlands'),
+ 'westcentral.unl.edu' => array('wcentomology', 'wcacreage'),
+ );
+
/**
* Keep track of the state of the migration progress so that we can resume later
* @var int
@@ -672,17 +686,30 @@ class Unl_Migration_Tool
return;
}
- $data = $this->_getUrl($this->_baseUrl . '?p_p_id=EXT_SITEMAP&p_p_state=exclusive&p_p_mode=view');
- if (strpos($data['contentType'], 'html') === FALSE) {
- return;
+ $urls = array();
+ $urls[] = $this->_baseUrl . '?p_p_id=EXT_SITEMAP&p_p_state=exclusive&p_p_mode=view';
+
+ $host = parse_url($this->_baseUrl, PHP_URL_HOST);
+ if (array_key_exists($host, $this->_liferaySubsites)) {
+ foreach ($this->_liferaySubsites[$host] as $subSite) {
+ $urls[] = $this->_baseUrl . 'web/' . $subSite . '/?p_p_id=EXT_SITEMAP&p_p_state=exclusive&p_p_mode=view';
+ }
}
-
- $dom = new DOMDocument();
- @$dom->loadHTML($data['content']);
- $linkNodes = $dom->getElementsByTagName('a');
- foreach ($linkNodes as $linkNode) {
- $this->_processLinks($linkNode->getAttribute('href'), '');
+ foreach ($urls as $url) {
+ $data = $this->_getUrl($url);
+
+ if (strpos($data['contentType'], 'html') === FALSE) {
+ return;
+ }
+
+ $dom = new DOMDocument();
+ @$dom->loadHTML($data['content']);
+
+ $linkNodes = $dom->getElementsByTagName('a');
+ foreach ($linkNodes as $linkNode) {
+ $this->_processLinks($linkNode->getAttribute('href'), '');
+ }
}
}
@@ -968,20 +995,6 @@ class Unl_Migration_Tool
$urlParts = parse_url($url);
$pathParts = explode('/', ltrim($urlParts['path'], '/'));
-
- $exceptions = array(
- 'cropwatch.unl.edu' => array('corn', 'drybeans', 'forages', 'organic', 'potato', 'sorghum', 'soybeans', 'wheat', 'bioenergy', 'insect', 'economics', 'ssm', 'soils', 'tillage', 'weed', 'varietytest', 'biotechnology', 'farmresearch', 'cropwatch-youth', 'militaryresources', 'gaps', 'sugarbeets'),
- '4h.unl.edu' => array('extension-4-h-horse', '4hcamps', '4hcurriclum'),
- 'animalscience.unl.edu' => array('fernando-lab', 'anscgenomics', 'rprb-lab', 'ruminutrition-lab'),
- 'beef.unl.edu' => array('cattleproduction'),
- 'biochem.unl.edu' => array('barycki', 'bailey', 'becker', 'adamec', 'wilson', 'biochem-fatttlab', 'simpson'),
- 'bse.unl.edu' => array('p2guidelines'),
- 'edmedia.unl.edu' => array('techtraining'),
- 'food.unl.edu' => array('localfoods', 'allergy', 'fnh', 'preservation', 'fpc', 'safety', 'meatproducts', 'youth'),
- 'ianrhome.unl.edu' => array('ianrinternational'),
- 'water.unl.edu' => array('crops', 'cropswater', 'drinkingwater', 'drought', 'wildlife', 'hydrology', 'lakes', 'landscapes', 'landscapewater', 'laweconomics', 'manure', 'propertydesign', 'research', 'sewage', 'students', 'watershed', 'wells', 'wetlands'),
- 'westcentral.unl.edu' => array('wcentomology', 'wcacreage'),
- );
$siteNameMap = array(
'extension' => 'www.extension.unl.edu',
@@ -990,7 +1003,7 @@ class Unl_Migration_Tool
if (
count($pathParts) >= 2 && $pathParts[0] == 'web'
- && !(in_array($urlParts['host'], array_keys($exceptions)) && in_array($pathParts[1], $exceptions[$urlParts['host']]))
+ && !(in_array($urlParts['host'], array_keys($this->_liferaySubsites)) && in_array($pathParts[1], $this->_liferaySubsites[$urlParts['host']]))
) {
// If the site name is "special" look it up in the map. Otherwise, just add .unl.edu
diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info
index bf0d33dffe83304f7773d06108a4309776177985..0e0c6d8106cbdc8f30f370006c33acd1df8c147c 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index 38dad5ae2f3d723c6f2680a6dbc1681e18f28ce0..adc546fb6f990a6fe73e068067fed27e0dbd7d79 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index 99194dd8885bb354b16589ad621f6d5e712ef5c6..76e4a190959bcc52b445601515c4c2f3b8ad5684 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"
diff --git a/themes/stark/stark.info b/themes/stark/stark.info
index 2402152378e45550bb9c6ece0da7c63b2a79f5d9..3ad46b80c1893e8951530020a5f38157b6f17169 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-02-20
-version = "7.20"
+; Information added by drupal.org packaging script on 2013-03-07
+version = "7.21"
project = "drupal"
-datestamp = "1361393684"
+datestamp = "1362616996"