From 7fc1a54ed32d4fe87f01c3a196561d390b309a18 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 19 Dec 2012 16:25:45 -0600
Subject: [PATCH] [gh-518] Upgrade Drupal Core to 7.18
---
CHANGELOG.txt | 3 +++
includes/bootstrap.inc | 2 +-
includes/file.inc | 3 +++
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/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.module | 8 +++++--
modules/user/user.test | 22 +++++++++++++++++--
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, 390 insertions(+), 362 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 94522f5aa..7f4f0ffe1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+Drupal 7.18, 2012-12-19
+-----------------------
+- Fixed security issues (multiple vulnerabilities). See SA-CORE-2012-004.
Drupal 7.17, 2012-11-07
-----------------------
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index cd41f0bbf..840733acc 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.17');
+define('VERSION', '7.18');
/**
* Core API compatibility.
diff --git a/includes/file.inc b/includes/file.inc
index 1e256c634..278be3ddc 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -1113,6 +1113,9 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
// Allow potentially insecure uploads for very savvy users and admin
if (!variable_get('allow_insecure_uploads', 0)) {
+ // Remove any null bytes. See http://php.net/manual/en/security.filesystem.nullbytes.php
+ $filename = str_replace(chr(0), '', $filename);
+
$whitelist = array_unique(explode(' ', trim($extensions)));
// Split the filename up by periods. The first part becomes the basename
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index 2f1d05357..9887301cc 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index 204d2edf2..7064c0505 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/block/block.info b/modules/block/block.info
index cd9bf089c..7d9b32cac 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index 077515208..1bdcb81a3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 4b585c5c9..0cc047bbe 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index bdfc3c03d..34cf74301 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/book/book.info b/modules/book/book.info
index d3e42dd44..d5e744df7 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/color/color.info b/modules/color/color.info
index a12fcdd54..cf86080a2 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index c42f7afba..0dfbf05fc 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 42c369994..958b8757b 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index b88194467..03e455e3c 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index 30091ddce..730eb3f94 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 3935ee9a4..f6820a780 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/field.info b/modules/field/field.info
index 88d4088bd..084cf2a46 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 d7d5e8e56..57760f84f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index 515b31095..eb2c65933 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index 107e3f98a..0a2ef03de 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index 478f2301c..b32acb268 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index abe3ac44c..debab886d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index 811d6417c..9b99a3439 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index 2b7673928..1a41f1da8 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index b68a951b2..6975caa29 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/file/file.info b/modules/file/file.info
index 16b58dd4b..b6ff17215 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
index a0725de9b..53bdf7dd3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 8de2adfca..679716337 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index 5f46897db..f56680440 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/help/help.info b/modules/help/help.info
index 23645a23e..9942a8bc3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/image/image.info b/modules/image/image.info
index df2551816..c157ddce5 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info
index 9e3832236..e9b4e2942 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
index 0861a48eb..842d86b31 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index ffd5175fe..64c039c6c 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 18a57a735..d70a4dd4c 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/node/node.info b/modules/node/node.info
index d2fd883ae..6dcc592ff 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index 7312d2fa9..c7d42d730 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index 702d44a4e..5b3f0abc1 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index 795f53667..1612b8550 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index 5faa5f533..51cb00d72 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index dccc075ce..f86312e69 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index f6dd0277e..ddff95e87 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/path/path.info b/modules/path/path.info
index 8e79a1e72..711398295 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/php/php.info b/modules/php/php.info
index 5409ab108..b746670cf 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index 2c1536ce7..57f959ccb 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index 051ad84be..f9b92c47a 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index 6b0e523dd..60688d4bf 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index 0dbbce8bf..4b244f697 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/search/search.info b/modules/search/search.info
index 25271b996..c74d9ede7 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 2c48e471e..780a6ccdc 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index 208fb6d31..063dbbc47 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index cc741e188..02602675d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index b9a77fc6c..4fb1d1b85 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index 6efd837dd..75ed02677 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index 6b93949f8..bd25b8453 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index ef9b93f84..94c1232cf 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index 6ded129f4..ef1d5494f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index b999bb068..401258e0d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/common_test_cron_helper.info b/modules/simpletest/tests/common_test_cron_helper.info
index 0ccf87db3..aefed486d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index 1e2a3ea01..1dc0f8883 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 07a44a143..db0405ebc 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 1ad4e306b..dd3461ca8 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info
index c2f02075a..f3070bd74 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info
index 71018af31..afe49650b 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info
index 9540f9ac6..70e106a81 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/entity_query_access_test.info b/modules/simpletest/tests/entity_query_access_test.info
index e5437532c..2e9915a2d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info
index 12a5a51ba..7f7d48392 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/file_test.info b/modules/simpletest/tests/file_test.info
index b7b761972..f75c65b88 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info
index 9f58a3039..647ab930f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index a5be94b8c..84e8337ce 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index f3b342290..88a14e905 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info
index 1b9c676be..f757fa649 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info
index e591d354c..69f0e863f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/path_test.info b/modules/simpletest/tests/path_test.info
index 94c850841..0b4a56e8e 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info
index 855ada58d..0abd16ada 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info
index f1d5886de..3e16727f6 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info
index 35b2f7f52..ed5da5c30 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info
index 09e49cb82..c9530ec12 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 03de8dd73..8b0213282 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/system_incompatible_core_version_test.info b/modules/simpletest/tests/system_incompatible_core_version_test.info
index 98f045a3a..27ecee1b1 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 5cba8c5c8..0dd13395e 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info
index 229df4554..e1eac2534 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/system_test.info b/modules/simpletest/tests/system_test.info
index f88b575ab..17e411577 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info
index 4b36f5508..b3d3910a9 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info
index b76dee573..691529843 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
index 97553613c..8bf651e36 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
index 082f782ea..74a8603c9 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info
index fa1873538..c0c455f05 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info
index 3a240fe76..79132f440 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info
index c4febe3d2..dc589a6f3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info
index c4febe3d2..dc589a6f3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info
index c4febe3d2..dc589a6f3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info
index d7fe962cf..48b6c6d67 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info
index b6a3cc49e..f1b9cb78f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index 628a94efb..bf0baf8e5 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info
index 963d87c5e..0e4891f19 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/system/system.info b/modules/system/system.info
index fab267a71..06ac454c3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index 2a565ab05..838aeb25e 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info
index 3191b5f53..6e2632acd 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index d3d8706cd..e4f971eaf 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info
index d11abcf95..eade14ce9 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/translation/translation.info b/modules/translation/translation.info
index 1449c7adf..100cbcd0d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info
index 5067e6a8b..b58a74004 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info
index 222b38282..e8ba827e3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
index 7c5179a23..2b7d40888 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
index d88c1fe9d..f611371f7 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
index 591af8fbc..9233d47c4 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 9e92226dc..64c3758bd 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 3dca01d47..ff9598194 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info
index d6883aef6..30a8cb10d 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/update/update.info b/modules/update/update.info
index f1a00def9..32ba01815 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info
index 1b33a82d6..02331e7d7 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/user/user.info b/modules/user/user.info
index 1f271a495..1deef749b 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/modules/user/user.module b/modules/user/user.module
index 2c02f8ce9..622fe4d25 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -933,14 +933,18 @@ function user_search_execute($keys = NULL, $conditions = NULL) {
$query = db_select('users')->extend('PagerDefault');
$query->fields('users', array('uid'));
if (user_access('administer users')) {
- // Administrators can also search in the otherwise private email field.
+ // Administrators can also search in the otherwise private email field,
+ // and they don't need to be restricted to only active users.
$query->fields('users', array('mail'));
$query->condition(db_or()->
condition('name', '%' . db_like($keys) . '%', 'LIKE')->
condition('mail', '%' . db_like($keys) . '%', 'LIKE'));
}
else {
- $query->condition('name', '%' . db_like($keys) . '%', 'LIKE');
+ // Regular users can only search via usernames, and we do not show them
+ // blocked accounts.
+ $query->condition('name', '%' . db_like($keys) . '%', 'LIKE')
+ ->condition('status', 1);
}
$uids = $query
->limit(15)
diff --git a/modules/user/user.test b/modules/user/user.test
index 92af9fa9a..123beee6c 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -2106,7 +2106,7 @@ class UserUserSearchTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'User search',
- 'description' => 'Testing that only user with the right permission can see the email address in the user search.',
+ 'description' => 'Tests the user search page and verifies that sensitive information is hidden from unauthorized users.',
'group' => 'User',
);
}
@@ -2126,11 +2126,29 @@ class UserUserSearchTestCase extends DrupalWebTestCase {
$edit = array('keys' => $keys);
$this->drupalPost('search/user/', $edit, t('Search'));
$this->assertText($keys);
+
+ // Create a blocked user.
+ $blocked_user = $this->drupalCreateUser();
+ $edit = array('status' => 0);
+ $blocked_user = user_save($blocked_user, $edit);
+
+ // Verify that users with "administer users" permissions can see blocked
+ // accounts in search results.
+ $edit = array('keys' => $blocked_user->name);
+ $this->drupalPost('search/user/', $edit, t('Search'));
+ $this->assertText($blocked_user->name, 'Blocked users are listed on the user search results for users with the "administer users" permission.');
+
+ // Verify that users without "administer users" permissions do not see
+ // blocked accounts in search results.
+ $this->drupalLogin($user1);
+ $edit = array('keys' => $blocked_user->name);
+ $this->drupalPost('search/user/', $edit, t('Search'));
+ $this->assertNoText($blocked_user->name, 'Blocked users are hidden from the user search results.');
+
$this->drupalLogout();
}
}
-
/**
* Test role assignment.
*/
diff --git a/profiles/minimal/minimal.info b/profiles/minimal/minimal.info
index 24df0c61d..9f143c795 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/profiles/standard/standard.info b/profiles/standard/standard.info
index ad397f4f4..2408b57f0 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 4fcb81ea9..537e6e4b8 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
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 068432fbb..36c2381ef 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/profiles/testing/testing.info b/profiles/testing/testing.info
index 124c9c045..cc84bf43f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info
index 96e95740c..3b3c37ec2 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index bfd7a17c9..551660027 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index 705e9f3a4..cb5d3d91f 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
diff --git a/themes/stark/stark.info b/themes/stark/stark.info
index f60e470f0..0e1475ce3 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 2012-11-07
-version = "7.17"
+; Information added by drupal.org packaging script on 2012-12-19
+version = "7.18"
project = "drupal"
-datestamp = "1352325357"
+datestamp = "1355944003"
--
GitLab