From c699499d63cd95cce49ef27c20bcaebda41d790c Mon Sep 17 00:00:00 2001 From: Nick Hepner Date: Fri, 19 Dec 2014 16:07:36 -0500 Subject: [PATCH] [#247] Update drupal while we're in here. --- docroot/.htaccess | 7 ----- docroot/CHANGELOG.txt | 4 +++ docroot/includes/bootstrap.inc | 2 +- docroot/includes/password.inc | 6 +++- docroot/includes/session.inc | 2 +- docroot/modules/aggregator/aggregator.info | 6 ++-- .../aggregator/tests/aggregator_test.info | 6 ++-- docroot/modules/block/block.info | 6 ++-- docroot/modules/block/tests/block_test.info | 6 ++-- .../block_test_theme/block_test_theme.info | 6 ++-- docroot/modules/blog/blog.info | 6 ++-- docroot/modules/book/book.info | 6 ++-- docroot/modules/color/color.info | 6 ++-- docroot/modules/comment/comment.info | 6 ++-- docroot/modules/contact/contact.info | 6 ++-- docroot/modules/contextual/contextual.info | 6 ++-- docroot/modules/dashboard/dashboard.info | 6 ++-- docroot/modules/dblog/dblog.info | 6 ++-- docroot/modules/field/field.info | 6 ++-- .../field_sql_storage/field_sql_storage.info | 6 ++-- docroot/modules/field/modules/list/list.info | 6 ++-- .../field/modules/list/tests/list_test.info | 6 ++-- .../modules/field/modules/number/number.info | 6 ++-- .../field/modules/options/options.info | 6 ++-- docroot/modules/field/modules/text/text.info | 6 ++-- docroot/modules/field/tests/field_test.info | 6 ++-- docroot/modules/field_ui/field_ui.info | 6 ++-- docroot/modules/file/file.info | 6 ++-- .../modules/file/tests/file_module_test.info | 6 ++-- docroot/modules/filter/filter.info | 6 ++-- docroot/modules/forum/forum.info | 6 ++-- docroot/modules/help/help.info | 6 ++-- docroot/modules/image/image.info | 6 ++-- .../image/tests/image_module_test.info | 6 ++-- docroot/modules/locale/locale.info | 6 ++-- docroot/modules/locale/tests/locale_test.info | 6 ++-- docroot/modules/menu/menu.info | 6 ++-- docroot/modules/node/node.info | 6 ++-- .../modules/node/tests/node_access_test.info | 6 ++-- docroot/modules/node/tests/node_test.info | 6 ++-- .../node/tests/node_test_exception.info | 6 ++-- docroot/modules/openid/openid.info | 6 ++-- docroot/modules/openid/tests/openid_test.info | 6 ++-- docroot/modules/overlay/overlay.info | 6 ++-- docroot/modules/path/path.info | 6 ++-- docroot/modules/php/php.info | 6 ++-- docroot/modules/poll/poll.info | 6 ++-- docroot/modules/profile/profile.info | 6 ++-- docroot/modules/rdf/rdf.info | 6 ++-- docroot/modules/rdf/tests/rdf_test.info | 6 ++-- docroot/modules/search/search.info | 6 ++-- .../search/tests/search_embedded_form.info | 6 ++-- .../search/tests/search_extra_type.info | 6 ++-- docroot/modules/shortcut/shortcut.info | 6 ++-- docroot/modules/simpletest/simpletest.info | 6 ++-- .../simpletest/tests/actions_loop_test.info | 6 ++-- .../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 ++-- .../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/password.test | 21 ++++++++++++++ .../modules/simpletest/tests/path_test.info | 6 ++-- .../tests/psr_0_test/psr_0_test.info | 6 ++-- .../simpletest/tests/requirements1_test.info | 6 ++-- .../simpletest/tests/requirements2_test.info | 6 ++-- .../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 ++-- .../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 ++-- .../simpletest/tests/update_test_1.info | 6 ++-- .../simpletest/tests/update_test_2.info | 6 ++-- .../simpletest/tests/update_test_3.info | 6 ++-- .../simpletest/tests/url_alter_test.info | 6 ++-- .../modules/simpletest/tests/xmlrpc_test.info | 6 ++-- docroot/modules/statistics/statistics.info | 6 ++-- docroot/modules/syslog/syslog.info | 6 ++-- docroot/modules/system/system.info | 6 ++-- .../modules/system/tests/cron_queue_test.info | 6 ++-- docroot/modules/taxonomy/taxonomy.info | 6 ++-- docroot/modules/toolbar/toolbar.info | 6 ++-- docroot/modules/tracker/tracker.info | 6 ++-- .../translation/tests/translation_test.info | 6 ++-- docroot/modules/translation/translation.info | 6 ++-- .../modules/trigger/tests/trigger_test.info | 6 ++-- docroot/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 ++-- docroot/modules/update/tests/update_test.info | 6 ++-- docroot/modules/update/update.info | 6 ++-- .../modules/user/tests/user_form_test.info | 6 ++-- docroot/modules/user/user.info | 6 ++-- docroot/profiles/minimal/minimal.info | 6 ++-- docroot/profiles/standard/standard.info | 6 ++-- ...drupal_system_listing_compatible_test.info | 6 ++-- ...upal_system_listing_incompatible_test.info | 6 ++-- docroot/profiles/testing/testing.info | 6 ++-- .../modules/contrib/context/README.txt | 2 +- .../modules/contrib/context/context.info | 6 ++-- .../context_layouts/context_layouts.info | 6 ++-- .../context/context_ui/context_ui.info | 6 ++-- .../context/plugins/context_reaction_menu.inc | 2 +- .../modules/contrib/ctools/LICENSE.txt | 0 .../ctools/bulk_export/bulk_export.info | 6 ++-- .../modules/contrib/ctools/ctools.info | 6 ++-- .../modules/contrib/ctools/ctools.module | 8 +++--- .../ctools_access_ruleset.info | 6 ++-- .../ctools_ajax_sample.info | 6 ++-- .../ctools_custom_content.info | 6 ++-- .../ctools_plugin_example.info | 6 ++-- .../contrib/ctools/help/plugins-creating.html | 11 ++++++++ .../modules/contrib/ctools/includes/ajax.inc | 28 +++++++++++++++++++ .../modules/contrib/ctools/includes/modal.inc | 16 ++++++++++- .../contrib/ctools/includes/utility.inc | 13 --------- .../modules/contrib/ctools/js/modal.js | 4 +++ .../ctools/page_manager/page_manager.info | 6 ++-- .../page_manager/plugins/tasks/page.admin.inc | 2 +- .../ctools/plugins/contexts/string.inc | 25 ++++++++++++++++- .../relationships/entity_from_field.inc | 12 ++++++-- .../contrib/ctools/stylizer/stylizer.info | 6 ++-- .../contrib/ctools/term_depth/term_depth.info | 6 ++-- .../ctools_export_test.info | 6 ++-- .../ctools/tests/ctools_plugin_test.info | 6 ++-- .../plugins/content_types/views.inc | 2 +- .../ctools/views_content/views_content.info | 6 ++-- docroot/themes/bartik/bartik.info | 6 ++-- docroot/themes/garland/garland.info | 6 ++-- docroot/themes/seven/seven.info | 6 ++-- docroot/themes/stark/stark.info | 6 ++-- 155 files changed, 540 insertions(+), 443 deletions(-) mode change 100755 => 100644 docroot/profiles/unallocated/modules/contrib/ctools/LICENSE.txt diff --git a/docroot/.htaccess b/docroot/.htaccess index dff6b55a..7ccb6a2f 100644 --- a/docroot/.htaccess +++ b/docroot/.htaccess @@ -109,13 +109,6 @@ DirectoryIndex index.php index.html index.htm # uncomment the following line: # RewriteBase / -# AIS: Adaptive Image Style - RewriteBase / - RewriteCond %{REQUEST_URI} ^(.+)/files/styles/adaptive/(.+)$ - RewriteCond %{REQUEST_URI} !/modules/image/sample.png - RewriteCond %{HTTP_COOKIE} ais=([a-z0-9_-]+) - RewriteRule ^(.+)/files/styles/adaptive/(.+)$ $1/files/styles/%1/$2 [R=302,L] - # Pass all requests not referring directly to files in the filesystem to # index.php. Clean URLs are handled in drupal_environment_initialize(). RewriteCond %{REQUEST_FILENAME} !-f diff --git a/docroot/CHANGELOG.txt b/docroot/CHANGELOG.txt index 6530aa87..ef848fb1 100644 --- a/docroot/CHANGELOG.txt +++ b/docroot/CHANGELOG.txt @@ -1,4 +1,8 @@ +Drupal 7.34, 2014-11-19 +---------------------- +- Fixed security issues (multiple vulnerabilities). See SA-CORE-2014-006. + Drupal 7.33, 2014-11-07 ----------------------- - Began storing the file modification time of each module and theme in the diff --git a/docroot/includes/bootstrap.inc b/docroot/includes/bootstrap.inc index 6fa369d4..744fc8fe 100644 --- a/docroot/includes/bootstrap.inc +++ b/docroot/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.33'); +define('VERSION', '7.34'); /** * Core API compatibility. diff --git a/docroot/includes/password.inc b/docroot/includes/password.inc index 3d5a400d..8228e611 100644 --- a/docroot/includes/password.inc +++ b/docroot/includes/password.inc @@ -140,7 +140,7 @@ function _password_enforce_log2_boundaries($count_log2) { * @param $algo * The string name of a hashing algorithm usable by hash(), like 'sha256'. * @param $password - * The plain-text password to hash. + * Plain-text password up to 512 bytes (128 to 512 UTF-8 characters) to hash. * @param $setting * An existing hash or the output of _password_generate_salt(). Must be * at least 12 characters (the settings and salt). @@ -150,6 +150,10 @@ function _password_enforce_log2_boundaries($count_log2) { * The return string will be truncated at DRUPAL_HASH_LENGTH characters max. */ function _password_crypt($algo, $password, $setting) { + // Prevent DoS attacks by refusing to hash large passwords. + if (strlen($password) > 512) { + return FALSE; + } // The first 12 characters of an existing hash are its setting string. $setting = substr($setting, 0, 12); diff --git a/docroot/includes/session.inc b/docroot/includes/session.inc index 9589e06f..84d1983b 100644 --- a/docroot/includes/session.inc +++ b/docroot/includes/session.inc @@ -79,7 +79,7 @@ function _drupal_session_read($sid) { // Handle the case of first time visitors and clients that don't store // cookies (eg. web crawlers). $insecure_session_name = substr(session_name(), 1); - if (!isset($_COOKIE[session_name()]) && !isset($_COOKIE[$insecure_session_name])) { + if (empty($sid) || (!isset($_COOKIE[session_name()]) && !isset($_COOKIE[$insecure_session_name]))) { $user = drupal_anonymous_user(); return ''; } diff --git a/docroot/modules/aggregator/aggregator.info b/docroot/modules/aggregator/aggregator.info index 7918abae..990f7e93 100644 --- a/docroot/modules/aggregator/aggregator.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/aggregator/tests/aggregator_test.info b/docroot/modules/aggregator/tests/aggregator_test.info index f1f21b0a..530c944c 100644 --- a/docroot/modules/aggregator/tests/aggregator_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/block/block.info b/docroot/modules/block/block.info index f7b7f761..a80ba4e9 100644 --- a/docroot/modules/block/block.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/block/tests/block_test.info b/docroot/modules/block/tests/block_test.info index daa71ba2..7644f36d 100644 --- a/docroot/modules/block/tests/block_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info b/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info index a70daae9..899c836d 100644 --- a/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/blog/blog.info b/docroot/modules/blog/blog.info index f33c9237..8f4f7f79 100644 --- a/docroot/modules/blog/blog.info +++ b/docroot/modules/blog/blog.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = blog.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/book/book.info b/docroot/modules/book/book.info index e4b73875..4e4d31e1 100644 --- a/docroot/modules/book/book.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/color/color.info b/docroot/modules/color/color.info index b7e3e161..88d7cffb 100644 --- a/docroot/modules/color/color.info +++ b/docroot/modules/color/color.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = color.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/comment/comment.info b/docroot/modules/comment/comment.info index 50fb17ef..ac610607 100644 --- a/docroot/modules/comment/comment.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/contact/contact.info b/docroot/modules/contact/contact.info index d2e9c654..b7f3a7cb 100644 --- a/docroot/modules/contact/contact.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/contextual/contextual.info b/docroot/modules/contextual/contextual.info index 8c83dba9..42266552 100644 --- a/docroot/modules/contextual/contextual.info +++ b/docroot/modules/contextual/contextual.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = contextual.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/dashboard/dashboard.info b/docroot/modules/dashboard/dashboard.info index acea9d2c..c852d47f 100644 --- a/docroot/modules/dashboard/dashboard.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/dblog/dblog.info b/docroot/modules/dblog/dblog.info index 37559a8c..6445d421 100644 --- a/docroot/modules/dblog/dblog.info +++ b/docroot/modules/dblog/dblog.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = dblog.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/field.info b/docroot/modules/field/field.info index c68c333a..b885d609 100644 --- a/docroot/modules/field/field.info +++ b/docroot/modules/field/field.info @@ -11,8 +11,8 @@ dependencies[] = field_sql_storage required = TRUE stylesheets[all][] = theme/field.css -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info b/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info index f43ed837..c69226c1 100644 --- a/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/modules/list/list.info b/docroot/modules/field/modules/list/list.info index 5d8001c1..3c9807f1 100644 --- a/docroot/modules/field/modules/list/list.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/modules/list/tests/list_test.info b/docroot/modules/field/modules/list/tests/list_test.info index 389b0a9b..09f553db 100644 --- a/docroot/modules/field/modules/list/tests/list_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/modules/number/number.info b/docroot/modules/field/modules/number/number.info index 2b5f1fd5..26527021 100644 --- a/docroot/modules/field/modules/number/number.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/modules/options/options.info b/docroot/modules/field/modules/options/options.info index 7ea78717..17642a1e 100644 --- a/docroot/modules/field/modules/options/options.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/modules/text/text.info b/docroot/modules/field/modules/text/text.info index 7c87786b..4d3afd34 100644 --- a/docroot/modules/field/modules/text/text.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field/tests/field_test.info b/docroot/modules/field/tests/field_test.info index 017a3b2f..a47d95f8 100644 --- a/docroot/modules/field/tests/field_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/field_ui/field_ui.info b/docroot/modules/field_ui/field_ui.info index 52fb1e7a..afb55d2c 100644 --- a/docroot/modules/field_ui/field_ui.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/file/file.info b/docroot/modules/file/file.info index cf190976..6ac9f888 100644 --- a/docroot/modules/file/file.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/file/tests/file_module_test.info b/docroot/modules/file/tests/file_module_test.info index f19d8df2..5f0bbb2f 100644 --- a/docroot/modules/file/tests/file_module_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/filter/filter.info b/docroot/modules/filter/filter.info index e867db27..b3a51464 100644 --- a/docroot/modules/filter/filter.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/forum/forum.info b/docroot/modules/forum/forum.info index 8924c8f5..56870408 100644 --- a/docroot/modules/forum/forum.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/help/help.info b/docroot/modules/help/help.info index c0657c7f..8db8096f 100644 --- a/docroot/modules/help/help.info +++ b/docroot/modules/help/help.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = help.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/image/image.info b/docroot/modules/image/image.info index a67d02f8..99a2375e 100644 --- a/docroot/modules/image/image.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/image/tests/image_module_test.info b/docroot/modules/image/tests/image_module_test.info index 40d67313..aad82924 100644 --- a/docroot/modules/image/tests/image_module_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/locale/locale.info b/docroot/modules/locale/locale.info index 8028869d..2f6e408b 100644 --- a/docroot/modules/locale/locale.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/locale/tests/locale_test.info b/docroot/modules/locale/tests/locale_test.info index dc5d5a6f..3daa74b4 100644 --- a/docroot/modules/locale/tests/locale_test.info +++ b/docroot/modules/locale/tests/locale_test.info @@ -5,8 +5,8 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/menu/menu.info b/docroot/modules/menu/menu.info index ee436db5..14db656a 100644 --- a/docroot/modules/menu/menu.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/node/node.info b/docroot/modules/node/node.info index 8906557a..964ec402 100644 --- a/docroot/modules/node/node.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/node/tests/node_access_test.info b/docroot/modules/node/tests/node_access_test.info index 29f7975e..17946efd 100644 --- a/docroot/modules/node/tests/node_access_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/node/tests/node_test.info b/docroot/modules/node/tests/node_test.info index cd83e010..b9b946e8 100644 --- a/docroot/modules/node/tests/node_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/node/tests/node_test_exception.info b/docroot/modules/node/tests/node_test_exception.info index bb81ab00..5db96296 100644 --- a/docroot/modules/node/tests/node_test_exception.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/openid/openid.info b/docroot/modules/openid/openid.info index c531b6c6..1b97354b 100644 --- a/docroot/modules/openid/openid.info +++ b/docroot/modules/openid/openid.info @@ -5,8 +5,8 @@ package = Core core = 7.x files[] = openid.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/openid/tests/openid_test.info b/docroot/modules/openid/tests/openid_test.info index d67f3caf..a33d5963 100644 --- a/docroot/modules/openid/tests/openid_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/overlay/overlay.info b/docroot/modules/overlay/overlay.info index fed2841a..269e323e 100644 --- a/docroot/modules/overlay/overlay.info +++ b/docroot/modules/overlay/overlay.info @@ -4,8 +4,8 @@ package = Core version = VERSION core = 7.x -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/path/path.info b/docroot/modules/path/path.info index 81cf5f51..3445b7c6 100644 --- a/docroot/modules/path/path.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/php/php.info b/docroot/modules/php/php.info index 0340d2ec..1fcb89d5 100644 --- a/docroot/modules/php/php.info +++ b/docroot/modules/php/php.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = php.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/poll/poll.info b/docroot/modules/poll/poll.info index 0edb0136..101b99e2 100644 --- a/docroot/modules/poll/poll.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/profile/profile.info b/docroot/modules/profile/profile.info index 76781418..593be3ee 100644 --- a/docroot/modules/profile/profile.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/rdf/rdf.info b/docroot/modules/rdf/rdf.info index 98d18762..e5c963cd 100644 --- a/docroot/modules/rdf/rdf.info +++ b/docroot/modules/rdf/rdf.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = rdf.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/rdf/tests/rdf_test.info b/docroot/modules/rdf/tests/rdf_test.info index 8a755df5..7602a942 100644 --- a/docroot/modules/rdf/tests/rdf_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/search/search.info b/docroot/modules/search/search.info index 0362b4d9..0a1bcc2d 100644 --- a/docroot/modules/search/search.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/search/tests/search_embedded_form.info b/docroot/modules/search/tests/search_embedded_form.info index b1dd94f5..2c789cc3 100644 --- a/docroot/modules/search/tests/search_embedded_form.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/search/tests/search_extra_type.info b/docroot/modules/search/tests/search_extra_type.info index a7620ccd..af8ba670 100644 --- a/docroot/modules/search/tests/search_extra_type.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/shortcut/shortcut.info b/docroot/modules/shortcut/shortcut.info index c51fa25e..2aa55da7 100644 --- a/docroot/modules/shortcut/shortcut.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/simpletest.info b/docroot/modules/simpletest/simpletest.info index e3a80c6e..4c6fcbe3 100644 --- a/docroot/modules/simpletest/simpletest.info +++ b/docroot/modules/simpletest/simpletest.info @@ -56,8 +56,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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/actions_loop_test.info b/docroot/modules/simpletest/tests/actions_loop_test.info index 5e712734..e3384381 100644 --- a/docroot/modules/simpletest/tests/actions_loop_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/ajax_forms_test.info b/docroot/modules/simpletest/tests/ajax_forms_test.info index fa96ccca..db582d41 100644 --- a/docroot/modules/simpletest/tests/ajax_forms_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/ajax_test.info b/docroot/modules/simpletest/tests/ajax_test.info index 75779eb5..736c0804 100644 --- a/docroot/modules/simpletest/tests/ajax_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/batch_test.info b/docroot/modules/simpletest/tests/batch_test.info index 5553ca19..4ee2142e 100644 --- a/docroot/modules/simpletest/tests/batch_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/common_test.info b/docroot/modules/simpletest/tests/common_test.info index 09fcf014..c8f4aeae 100644 --- a/docroot/modules/simpletest/tests/common_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/common_test_cron_helper.info b/docroot/modules/simpletest/tests/common_test_cron_helper.info index fdc2a236..780e5449 100644 --- a/docroot/modules/simpletest/tests/common_test_cron_helper.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/database_test.info b/docroot/modules/simpletest/tests/database_test.info index 5c422f91..d755deb0 100644 --- a/docroot/modules/simpletest/tests/database_test.info +++ b/docroot/modules/simpletest/tests/database_test.info @@ -5,8 +5,8 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/docroot/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info index cd1a8187..9baa2232 100644 --- a/docroot/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/docroot/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info index 2a26a133..9a6ea5a1 100644 --- a/docroot/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/entity_cache_test.info b/docroot/modules/simpletest/tests/entity_cache_test.info index 3ae8f5eb..892f2a62 100644 --- a/docroot/modules/simpletest/tests/entity_cache_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/entity_cache_test_dependency.info b/docroot/modules/simpletest/tests/entity_cache_test_dependency.info index 80ed2a28..f1e23800 100644 --- a/docroot/modules/simpletest/tests/entity_cache_test_dependency.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/entity_crud_hook_test.info b/docroot/modules/simpletest/tests/entity_crud_hook_test.info index 4f57a2e2..80477669 100644 --- a/docroot/modules/simpletest/tests/entity_crud_hook_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/entity_query_access_test.info b/docroot/modules/simpletest/tests/entity_query_access_test.info index 97b49920..25da2194 100644 --- a/docroot/modules/simpletest/tests/entity_query_access_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/error_test.info b/docroot/modules/simpletest/tests/error_test.info index 52c09a5d..537af89a 100644 --- a/docroot/modules/simpletest/tests/error_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/file_test.info b/docroot/modules/simpletest/tests/file_test.info index 20881f12..dbeb7505 100644 --- a/docroot/modules/simpletest/tests/file_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/filter_test.info b/docroot/modules/simpletest/tests/filter_test.info index ebe2bc2b..d30cfa5a 100644 --- a/docroot/modules/simpletest/tests/filter_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/form_test.info b/docroot/modules/simpletest/tests/form_test.info index 6c7b501f..406bcd27 100644 --- a/docroot/modules/simpletest/tests/form_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/image_test.info b/docroot/modules/simpletest/tests/image_test.info index c10a8f2f..b851329d 100644 --- a/docroot/modules/simpletest/tests/image_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/menu_test.info b/docroot/modules/simpletest/tests/menu_test.info index 87e7e934..e7509b5e 100644 --- a/docroot/modules/simpletest/tests/menu_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/module_test.info b/docroot/modules/simpletest/tests/module_test.info index 372fce3a..de28a42c 100644 --- a/docroot/modules/simpletest/tests/module_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/password.test b/docroot/modules/simpletest/tests/password.test index 5259d19e..7105f3b7 100644 --- a/docroot/modules/simpletest/tests/password.test +++ b/docroot/modules/simpletest/tests/password.test @@ -57,4 +57,25 @@ class PasswordHashingTest extends DrupalWebTestCase { $this->assertFalse(user_needs_new_hash($account), 'Re-hashed password does not need a new hash.'); $this->assertTrue(user_check_password($password, $account), 'Password check succeeds with re-hashed password.'); } + + /** + * Verifies that passwords longer than 512 bytes are not hashed. + */ + public function testLongPassword() { + $password = str_repeat('x', 512); + $result = user_hash_password($password); + $this->assertFalse(empty($result), '512 byte long password is allowed.'); + $password = str_repeat('x', 513); + $result = user_hash_password($password); + $this->assertFalse($result, '513 byte long password is not allowed.'); + // Check a string of 3-byte UTF-8 characters. + $password = str_repeat('€', 170); + $result = user_hash_password($password); + $this->assertFalse(empty($result), '510 byte long password is allowed.'); + $password .= 'xx'; + $this->assertFalse(empty($result), '512 byte long password is allowed.'); + $password = str_repeat('€', 171); + $result = user_hash_password($password); + $this->assertFalse($result, '513 byte long password is not allowed.'); + } } diff --git a/docroot/modules/simpletest/tests/path_test.info b/docroot/modules/simpletest/tests/path_test.info index d7608a8c..ba7fbd65 100644 --- a/docroot/modules/simpletest/tests/path_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info b/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info index 5725ebd9..20e83202 100644 --- a/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info +++ b/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info @@ -5,8 +5,8 @@ core = 7.x hidden = TRUE package = Testing -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/requirements1_test.info b/docroot/modules/simpletest/tests/requirements1_test.info index 7d8c6ae9..7d6b0114 100644 --- a/docroot/modules/simpletest/tests/requirements1_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/requirements2_test.info b/docroot/modules/simpletest/tests/requirements2_test.info index e424b162..af0032d6 100644 --- a/docroot/modules/simpletest/tests/requirements2_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/session_test.info b/docroot/modules/simpletest/tests/session_test.info index 609803f6..5851c3bb 100644 --- a/docroot/modules/simpletest/tests/session_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/system_dependencies_test.info b/docroot/modules/simpletest/tests/system_dependencies_test.info index 58401850..8c198a06 100644 --- a/docroot/modules/simpletest/tests/system_dependencies_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/docroot/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info index 59acdeec..cfa6983f 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/system_incompatible_core_version_test.info b/docroot/modules/simpletest/tests/system_incompatible_core_version_test.info index 87a10010..976bfe2f 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_core_version_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/docroot/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info index c5b220ae..3eb98492 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/system_incompatible_module_version_test.info b/docroot/modules/simpletest/tests/system_incompatible_module_version_test.info index 5e02ad7e..be297a36 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_module_version_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/system_test.info b/docroot/modules/simpletest/tests/system_test.info index b61d8a45..af0eeae7 100644 --- a/docroot/modules/simpletest/tests/system_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/taxonomy_test.info b/docroot/modules/simpletest/tests/taxonomy_test.info index 3f4eb191..e6d525fb 100644 --- a/docroot/modules/simpletest/tests/taxonomy_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/theme_test.info b/docroot/modules/simpletest/tests/theme_test.info index 93ea498b..49696626 100644 --- a/docroot/modules/simpletest/tests/theme_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/docroot/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info index 0b32f6a3..534537e3 100644 --- a/docroot/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/docroot/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info index d273b024..3797325b 100644 --- a/docroot/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/themes/test_theme/test_theme.info b/docroot/modules/simpletest/tests/themes/test_theme/test_theme.info index 86593551..c6bf3406 100644 --- a/docroot/modules/simpletest/tests/themes/test_theme/test_theme.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/update_script_test.info b/docroot/modules/simpletest/tests/update_script_test.info index cb0abd51..ab974c51 100644 --- a/docroot/modules/simpletest/tests/update_script_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/update_test_1.info b/docroot/modules/simpletest/tests/update_test_1.info index 59b7154f..01763a35 100644 --- a/docroot/modules/simpletest/tests/update_test_1.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/update_test_2.info b/docroot/modules/simpletest/tests/update_test_2.info index 59b7154f..01763a35 100644 --- a/docroot/modules/simpletest/tests/update_test_2.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/update_test_3.info b/docroot/modules/simpletest/tests/update_test_3.info index 59b7154f..01763a35 100644 --- a/docroot/modules/simpletest/tests/update_test_3.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/url_alter_test.info b/docroot/modules/simpletest/tests/url_alter_test.info index 3afc9f49..af00b0f5 100644 --- a/docroot/modules/simpletest/tests/url_alter_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/simpletest/tests/xmlrpc_test.info b/docroot/modules/simpletest/tests/xmlrpc_test.info index 28567942..11139833 100644 --- a/docroot/modules/simpletest/tests/xmlrpc_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/statistics/statistics.info b/docroot/modules/statistics/statistics.info index 8bf97ff4..6c818c3e 100644 --- a/docroot/modules/statistics/statistics.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/syslog/syslog.info b/docroot/modules/syslog/syslog.info index 8c11c5e9..b12b1270 100644 --- a/docroot/modules/syslog/syslog.info +++ b/docroot/modules/syslog/syslog.info @@ -6,8 +6,8 @@ core = 7.x files[] = syslog.test configure = admin/config/development/logging -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/system/system.info b/docroot/modules/system/system.info index f0b92a5d..d8ee86e9 100644 --- a/docroot/modules/system/system.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/system/tests/cron_queue_test.info b/docroot/modules/system/tests/cron_queue_test.info index 4fd1bd8b..3e26e251 100644 --- a/docroot/modules/system/tests/cron_queue_test.info +++ b/docroot/modules/system/tests/cron_queue_test.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/taxonomy/taxonomy.info b/docroot/modules/taxonomy/taxonomy.info index 00948dd0..e2d5727a 100644 --- a/docroot/modules/taxonomy/taxonomy.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/toolbar/toolbar.info b/docroot/modules/toolbar/toolbar.info index 48adb661..a35b6ba7 100644 --- a/docroot/modules/toolbar/toolbar.info +++ b/docroot/modules/toolbar/toolbar.info @@ -4,8 +4,8 @@ core = 7.x package = Core version = VERSION -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/tracker/tracker.info b/docroot/modules/tracker/tracker.info index 5a5b5390..d9994778 100644 --- a/docroot/modules/tracker/tracker.info +++ b/docroot/modules/tracker/tracker.info @@ -6,8 +6,8 @@ version = VERSION core = 7.x files[] = tracker.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/translation/tests/translation_test.info b/docroot/modules/translation/tests/translation_test.info index 921bcf61..aecb9841 100644 --- a/docroot/modules/translation/tests/translation_test.info +++ b/docroot/modules/translation/tests/translation_test.info @@ -5,8 +5,8 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/translation/translation.info b/docroot/modules/translation/translation.info index f5521f72..1ff8a134 100644 --- a/docroot/modules/translation/translation.info +++ b/docroot/modules/translation/translation.info @@ -6,8 +6,8 @@ version = VERSION core = 7.x files[] = translation.test -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/trigger/tests/trigger_test.info b/docroot/modules/trigger/tests/trigger_test.info index 93b41349..f725f905 100644 --- a/docroot/modules/trigger/tests/trigger_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/trigger/trigger.info b/docroot/modules/trigger/trigger.info index e717ee09..30fc8bba 100644 --- a/docroot/modules/trigger/trigger.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/tests/aaa_update_test.info b/docroot/modules/update/tests/aaa_update_test.info index a016f415..935852d5 100644 --- a/docroot/modules/update/tests/aaa_update_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/tests/bbb_update_test.info b/docroot/modules/update/tests/bbb_update_test.info index 47ab5b5b..83830dc1 100644 --- a/docroot/modules/update/tests/bbb_update_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/tests/ccc_update_test.info b/docroot/modules/update/tests/ccc_update_test.info index ee64603b..54499be4 100644 --- a/docroot/modules/update/tests/ccc_update_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info b/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info index b47dd4cc..904c0b1e 100644 --- a/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info b/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info index 9f8ea0e8..a08108a5 100644 --- a/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/tests/update_test.info b/docroot/modules/update/tests/update_test.info index d53cc3cc..0aa8d80d 100644 --- a/docroot/modules/update/tests/update_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/update/update.info b/docroot/modules/update/update.info index 20c3b0e3..dbdd67dc 100644 --- a/docroot/modules/update/update.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/user/tests/user_form_test.info b/docroot/modules/user/tests/user_form_test.info index f0ea4a6b..5a30a0b5 100644 --- a/docroot/modules/user/tests/user_form_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/modules/user/user.info b/docroot/modules/user/user.info index 0d65345c..f3cf393b 100644 --- a/docroot/modules/user/user.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/profiles/minimal/minimal.info b/docroot/profiles/minimal/minimal.info index 965e69fa..6d6ce1a5 100644 --- a/docroot/profiles/minimal/minimal.info +++ b/docroot/profiles/minimal/minimal.info @@ -5,8 +5,8 @@ core = 7.x dependencies[] = block dependencies[] = dblog -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/profiles/standard/standard.info b/docroot/profiles/standard/standard.info index d2d2f12f..81eba8c4 100644 --- a/docroot/profiles/standard/standard.info +++ b/docroot/profiles/standard/standard.info @@ -24,8 +24,8 @@ dependencies[] = field_ui dependencies[] = file dependencies[] = rdf -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info index 1d3ec366..0b1d3140 100644 --- a/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info index 8168bad9..21c13265 100644 --- a/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/profiles/testing/testing.info b/docroot/profiles/testing/testing.info index 3789ce41..df8cdfe1 100644 --- a/docroot/profiles/testing/testing.info +++ b/docroot/profiles/testing/testing.info @@ -4,8 +4,8 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/profiles/unallocated/modules/contrib/context/README.txt b/docroot/profiles/unallocated/modules/contrib/context/README.txt index 460c947d..994ddab6 100644 --- a/docroot/profiles/unallocated/modules/contrib/context/README.txt +++ b/docroot/profiles/unallocated/modules/contrib/context/README.txt @@ -13,7 +13,7 @@ version. You will need the latest CTools (as of Sept. 16 2010) from here: - all reactions - context UI - context layouts -- inline editor (with Admin 2.x for D7) +- inline editor (see the context_ui README file for info on enabling) ### Expect API changes diff --git a/docroot/profiles/unallocated/modules/contrib/context/context.info b/docroot/profiles/unallocated/modules/contrib/context/context.info index 12c9f3fc..1be8a2bd 100644 --- a/docroot/profiles/unallocated/modules/contrib/context/context.info +++ b/docroot/profiles/unallocated/modules/contrib/context/context.info @@ -8,9 +8,9 @@ files[] = tests/context.test files[] = tests/context.conditions.test files[] = tests/context.reactions.test -; Information added by Drupal.org packaging script on 2014-09-30 -version = "7.x-3.3" +; Information added by Drupal.org packaging script on 2014-12-11 +version = "7.x-3.5" core = "7.x" project = "context" -datestamp = "1412114935" +datestamp = "1418341081" diff --git a/docroot/profiles/unallocated/modules/contrib/context/context_layouts/context_layouts.info b/docroot/profiles/unallocated/modules/contrib/context/context_layouts/context_layouts.info index a30a8312..b6bc72f8 100644 --- a/docroot/profiles/unallocated/modules/contrib/context/context_layouts/context_layouts.info +++ b/docroot/profiles/unallocated/modules/contrib/context/context_layouts/context_layouts.info @@ -6,9 +6,9 @@ core = 7.x files[] = plugins/context_layouts_reaction_block.inc -; Information added by Drupal.org packaging script on 2014-09-30 -version = "7.x-3.3" +; Information added by Drupal.org packaging script on 2014-12-11 +version = "7.x-3.5" core = "7.x" project = "context" -datestamp = "1412114935" +datestamp = "1418341081" diff --git a/docroot/profiles/unallocated/modules/contrib/context/context_ui/context_ui.info b/docroot/profiles/unallocated/modules/contrib/context/context_ui/context_ui.info index dda868c0..e083ae56 100644 --- a/docroot/profiles/unallocated/modules/contrib/context/context_ui/context_ui.info +++ b/docroot/profiles/unallocated/modules/contrib/context/context_ui/context_ui.info @@ -8,9 +8,9 @@ configure = admin/structure/context files[] = context.module files[] = tests/context_ui.test -; Information added by Drupal.org packaging script on 2014-09-30 -version = "7.x-3.3" +; Information added by Drupal.org packaging script on 2014-12-11 +version = "7.x-3.5" core = "7.x" project = "context" -datestamp = "1412114935" +datestamp = "1418341081" diff --git a/docroot/profiles/unallocated/modules/contrib/context/plugins/context_reaction_menu.inc b/docroot/profiles/unallocated/modules/contrib/context/plugins/context_reaction_menu.inc index 1118ec3a..0d82adce 100644 --- a/docroot/profiles/unallocated/modules/contrib/context/plugins/context_reaction_menu.inc +++ b/docroot/profiles/unallocated/modules/contrib/context/plugins/context_reaction_menu.inc @@ -16,7 +16,7 @@ class context_reaction_menu extends context_reaction { list($menu_name, $mlid) = explode(':', $id); // Store the title each menu for reference. if ($mlid == '0') { - $menu_names[$menu_name] = check_plain($title); + $menu_names[$menu_name] = $title; } else { $link = menu_link_load($mlid); diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/LICENSE.txt b/docroot/profiles/unallocated/modules/contrib/ctools/LICENSE.txt old mode 100755 new mode 100644 diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/bulk_export/bulk_export.info b/docroot/profiles/unallocated/modules/contrib/ctools/bulk_export/bulk_export.info index f78fb86e..f4c974cc 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/bulk_export/bulk_export.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/bulk_export/bulk_export.info @@ -4,9 +4,9 @@ core = 7.x dependencies[] = ctools package = Chaos tool suite -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/ctools.info b/docroot/profiles/unallocated/modules/contrib/ctools/ctools.info index 05d3d5f3..230dae05 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/ctools.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/ctools.info @@ -6,9 +6,9 @@ files[] = includes/context.inc files[] = includes/math-expr.inc files[] = includes/stylizer.inc -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/ctools.module b/docroot/profiles/unallocated/modules/contrib/ctools/ctools.module index b5ab6264..0ce44571 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/ctools.module +++ b/docroot/profiles/unallocated/modules/contrib/ctools/ctools.module @@ -298,7 +298,7 @@ function ctools_break_phrase($str) { /** * Set a token/value pair to be replaced later in the request, specifically in - * ctools_preprocess_page(). + * ctools_page_token_processing(). * * @param $token * The token to be replaced later, during page rendering. This should @@ -654,15 +654,15 @@ function ctools_page_token_processing($children, $elements) { list($type, $argument) = $key; switch ($type) { case 'variable': - $tokens[$token] = isset($variables[$argument]) ? $variables[$argument] : ''; + $tokens[$token] = isset($elements[$argument]) ? $elements[$argument] : ''; break; case 'callback': if (is_string($argument) && function_exists($argument)) { - $tokens[$token] = $argument($variables); + $tokens[$token] = $argument($elements); } if (is_array($argument) && function_exists($argument[0])) { $function = array_shift($argument); - $argument = array_merge(array(&$variables), $argument); + $argument = array_merge(array(&$elements), $argument); $tokens[$token] = call_user_func_array($function, $argument); } break; diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info index 8bde6791..69a78a06 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info @@ -4,9 +4,9 @@ core = 7.x package = Chaos tool suite dependencies[] = ctools -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info index 37916965..bbbf2fd3 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info @@ -4,9 +4,9 @@ package = Chaos tool suite dependencies[] = ctools core = 7.x -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info index 4f64f8d1..0da53ac0 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info @@ -4,9 +4,9 @@ core = 7.x package = Chaos tool suite dependencies[] = ctools -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info index 4a855a22..92fa2778 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info @@ -7,9 +7,9 @@ dependencies[] = page_manager dependencies[] = advanced_help core = 7.x -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/help/plugins-creating.html b/docroot/profiles/unallocated/modules/contrib/ctools/help/plugins-creating.html index 29a9014f..23237058 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/help/plugins-creating.html +++ b/docroot/profiles/unallocated/modules/contrib/ctools/help/plugins-creating.html @@ -24,6 +24,17 @@

Defining a plugin

cache table
Defaults to: 'cache'
If 'cache' is TRUE, then this value specifies the cache table where the cached plugin information will be stored.
+
classes
+
Defaults to: array()
+
An array of class identifiers(i.e. plugin array keys) which a plugin of this type uses to provide classes to the CTools autoloader. For example, if classes is set to array('class'), then CTools will search each $plugin['class'] for a class to autoload. Depending of the plugin structure, a class identifier may be either:
+
+
- a file name:
+
the file which holds the class with the name structure as: [filename].[class].php
+
in this case the class name can be different than the class identifier
+
- the class name:
+
if the class is in the same file as the $plugin
+
the plugin .inc file can have a different name than the class identifier
+
defaults
Defaults to: array()
An array of defaults that should be added to each plugin; this can be used to ensure that every plugin has the basic data necessary. These defaults will not ovewrite data supplied by the plugin. This could also be a function name, in which case the callback will be used to provide defaults. NOTE, however, that the callback-based approach is deprecated as it is redundant with the 'process' callback, and as such will be removed in later versions. Consequently, you should only use the array form for maximum cross-version compatibility.
diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/includes/ajax.inc b/docroot/profiles/unallocated/modules/contrib/ctools/includes/ajax.inc index bb17bea2..96f5068f 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/includes/ajax.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/includes/ajax.inc @@ -49,6 +49,34 @@ function ctools_ajax_text_button($text, $dest, $alt, $class = '', $type = 'use-a return l($text, $dest, array('html' => TRUE, 'attributes' => array('class' => array($type, $class), 'title' => $alt))); } +/** + * Render an icon and related text as a link. This will automatically apply an AJAX class + * to the link and add the appropriate javascript to make this happen. + * + * Note: 'html' => true so be sure any text is vetted! Chances are these kinds of buttons will + * not use user input so this is a very minor concern. + * + * @param $text + * The text that will be displayed as the link. + * @param $image + * The icon image to include in the link. + * @param $dest + * The destination of the link. + * @param $alt + * The title text of the link. + * @param $class + * Any class to apply to the link. @todo this should be a options array. + * @param $type + * A type to use, in case a different behavior should be attached. Defaults + * to ctools-use-ajax. + */ +function ctools_ajax_icon_text_button($text, $image, $dest, $alt, $class = '', $type = 'use-ajax') { + drupal_add_library('system', 'drupal.ajax'); + $rendered_image = theme('image', array('path' => $image)); + $link_content = $rendered_image . "" . $text . ""; + return l($link_content, $dest, array('html' => TRUE, 'attributes' => array('class' => array($type, $class), 'title' => $alt))); +} + /** * Set a single property to a value, on all matched elements. * diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/includes/modal.inc b/docroot/profiles/unallocated/modules/contrib/ctools/includes/modal.inc index dfde0ac0..4f994b67 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/includes/modal.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/includes/modal.inc @@ -188,8 +188,15 @@ function ctools_modal_text_button($text, $dest, $alt, $class = '') { * Wrap a form so that we can use it properly with AJAX. Essentially if the * form wishes to render, it automatically does that, otherwise it returns * so we can see submission results. + + * @param array $form + * An associative array containing the structure of the form. + * @param array $form_state + * An associative array containing the current state of the form. + * If the 'reset_html_ids' key is set to TRUE, it will prevent HTML IDs in + * forms from being incremented. * - * @return + * @return mixed * The output of the form, if it was rendered. If $form_state['ajax'] * is set, this will use ctools_modal_form_render so it will be * a $command object suitable for ajax_render already. @@ -199,6 +206,13 @@ function ctools_modal_text_button($text, $dest, $alt, $class = '') { * form will never be redirected. */ function ctools_modal_form_wrapper($form_id, &$form_state) { + // Since this will run again on form rebuild while still in the modal, prevent + // form IDs from being incremented. + // @todo https://drupal.org/node/1305882 + if (!empty($form_state['reset_html_ids']) && !empty($_POST['ajax_html_ids'])) { + unset($_POST['ajax_html_ids']); + } + // This won't override settings already in. $form_state += array( 're_render' => FALSE, diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/includes/utility.inc b/docroot/profiles/unallocated/modules/contrib/ctools/includes/utility.inc index 9795dd86..82fc1471 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/includes/utility.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/includes/utility.inc @@ -29,16 +29,3 @@ function ctools_passthrough($module, $type, &$items) { } } } - -/** - * Implementation of hook_theme_registry_alter() - */ -function ctools_theme_registry_alter(&$registry) { - // Move this one last last last so it can catch changes made by modules and themes. - $key = array_search('ctools_preprocess_page', $registry['page']['preprocess functions']); - if ($key) { - unset($registry['page']['preprocess functions'][$key]); - } - $registry['page']['preprocess functions'][] = 'ctools_preprocess_page'; -} - diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/js/modal.js b/docroot/profiles/unallocated/modules/contrib/ctools/js/modal.js index 33f071ff..98f36097 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/js/modal.js +++ b/docroot/profiles/unallocated/modules/contrib/ctools/js/modal.js @@ -258,6 +258,10 @@ $('input[type=submit], button', this).click(function(event) { Drupal.ajax[base].element = this; this.form.clk = this; + // Stop autocomplete from submitting. + if (Drupal.autocompleteSubmit && !Drupal.autocompleteSubmit()) { + return false; + } // An empty event means we were triggered via .click() and // in jquery 1.4 this won't trigger a submit. if (event.bubbles == undefined) { diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/page_manager.info b/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/page_manager.info index 709dd778..8103ca8c 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/page_manager.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/page_manager.info @@ -4,9 +4,9 @@ core = 7.x dependencies[] = ctools package = Chaos tool suite -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc b/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc index eb2dcaa1..88d46c5b 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc @@ -443,7 +443,7 @@ function page_manager_page_form_basic($form, &$form_state) { '#type' => 'checkbox', '#default_value' => !empty($page->make_frontpage), '#title' => t('Make this your site home page.'), - '#description' => t('To set this panel as your home page you must create a unique path name with no % placeholders in the path. The site home page is currently set to %homepage on the !siteinfo configuration form.', array('!siteinfo' => l(t('Site Information'), 'admin/settings/site-information'), '%homepage' => '/' . $frontpage)), + '#description' => t('To set this panel as your home page you must create a unique path name with no % placeholders in the path. The site home page is currently set to %homepage on the !siteinfo configuration form.', array('!siteinfo' => l(t('Site Information'), 'admin/config/system/site-information'), '%homepage' => '/' . $frontpage)), ); $form['admin_paths'] = array( '#type' => 'checkbox', diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/plugins/contexts/string.inc b/docroot/profiles/unallocated/modules/contrib/ctools/plugins/contexts/string.inc index 0ea5e526..9a715b89 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/plugins/contexts/string.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/plugins/contexts/string.inc @@ -14,6 +14,8 @@ $plugin = array( 'title' => t('String'), 'description' => t('A context that is just a string.'), 'context' => 'ctools_context_create_string', + 'edit form' => 'ctools_context_string_settings_form', + 'defaults' => '', 'keyword' => 'string', 'no ui' => FALSE, 'context name' => 'string', @@ -44,7 +46,8 @@ function ctools_context_create_string($empty, $data = NULL, $conf = FALSE) { } if ($data !== FALSE ) { - $context->data = $data; + // Support the array storage from the settings form but also handle direct input from arguments. + $context->data = is_array($data) ? $data['string'] : $data; $context->title = ($conf) ? check_plain($data['identifier']) : check_plain($data); return $context; } @@ -62,3 +65,23 @@ function ctools_context_string_convert($context, $type) { } } +/** + * String settings form. + */ +function ctools_context_string_settings_form($form, &$form_state) { + $conf = &$form_state['conf']; + + $form['string'] = array( + '#title' => t('Enter the string'), + '#type' => 'textfield', + '#maxlength' => 512, + '#weight' => -10, + '#default_value' => $conf['string'], + ); + + return $form; +} + +function ctools_context_string_settings_form_submit($form, &$form_state) { + $form_state['conf']['string'] = $form_state['values']['string']; +} diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/plugins/relationships/entity_from_field.inc b/docroot/profiles/unallocated/modules/contrib/ctools/plugins/relationships/entity_from_field.inc index 15f712be..d4880c6f 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/plugins/relationships/entity_from_field.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/plugins/relationships/entity_from_field.inc @@ -154,6 +154,11 @@ function ctools_entity_from_field_get_children($parent_plugin, $parent) { * Return a new context based on an existing context. */ function ctools_entity_from_field_context($context, $conf) { + // Perform access check on current logged in user. + global $user; + // Clone user object so account can be passed by value to access callback. + $account = clone $user; + $delta = !empty($conf['delta']) ? intval($conf['delta']) : 0; $plugin = $conf['name']; list($plugin, $plugin_name) = explode(':', $plugin); @@ -176,8 +181,11 @@ function ctools_entity_from_field_context($context, $conf) { $plugin_info = ctools_get_relationship($conf['name']); $to_entity_id = $items[$delta][$plugin_info['source key']]; - $loaded_to_entity = array_shift(entity_load($to_entity, array($to_entity_id))); - if(function_exists($to_entity_info['access callback']) && !call_user_func($to_entity_info['access callback'], 'view', $loaded_to_entity)) { + $loaded_to_entity = entity_load($to_entity, array($to_entity_id)); + $loaded_to_entity = array_shift($loaded_to_entity); + + // Pass current user account and entity type to access callback. + if (function_exists($to_entity_info['access callback']) && !call_user_func($to_entity_info['access callback'], 'view', $loaded_to_entity, $account, $to_entity)) { return ctools_context_create_empty('entity:' . $to_entity, NULL); } else { diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/stylizer/stylizer.info b/docroot/profiles/unallocated/modules/contrib/ctools/stylizer/stylizer.info index 2163e646..9acbe737 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/stylizer/stylizer.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/stylizer/stylizer.info @@ -5,9 +5,9 @@ package = Chaos tool suite dependencies[] = ctools dependencies[] = color -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/term_depth/term_depth.info b/docroot/profiles/unallocated/modules/contrib/ctools/term_depth/term_depth.info index 2986d6d8..0b035582 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/term_depth/term_depth.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/term_depth/term_depth.info @@ -3,9 +3,9 @@ description = Controls access to context based upon term depth core = 7.x dependencies[] = ctools package = Chaos tool suite -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info b/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info index a5803725..dfc023e7 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info @@ -7,9 +7,9 @@ hidden = TRUE files[] = ctools_export.test -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_plugin_test.info b/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_plugin_test.info index 186012b4..955f2063 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_plugin_test.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/tests/ctools_plugin_test.info @@ -11,9 +11,9 @@ files[] = math_expression.test files[] = math_expression_stack.test hidden = TRUE -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/views_content/plugins/content_types/views.inc b/docroot/profiles/unallocated/modules/contrib/ctools/views_content/plugins/content_types/views.inc index 93f14c61..262d81de 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/views_content/plugins/content_types/views.inc +++ b/docroot/profiles/unallocated/modules/contrib/ctools/views_content/plugins/content_types/views.inc @@ -145,12 +145,12 @@ function views_content_views_content_type_render($subtype, $conf, $panel_args, $ } if (!empty($contexts[$cid])) { $arg = ctools_context_convert_context($contexts[$cid], $converter, array('sanitize' => FALSE)); + array_splice($args, $count, 0, array($arg)); } else { // Make sure we put an argument in even if it was not there. $arg = NULL; } - array_splice($args, $count, 0, array($arg)); } } diff --git a/docroot/profiles/unallocated/modules/contrib/ctools/views_content/views_content.info b/docroot/profiles/unallocated/modules/contrib/ctools/views_content/views_content.info index a4be9300..2d67e974 100644 --- a/docroot/profiles/unallocated/modules/contrib/ctools/views_content/views_content.info +++ b/docroot/profiles/unallocated/modules/contrib/ctools/views_content/views_content.info @@ -9,9 +9,9 @@ files[] = plugins/views/views_content_plugin_display_ctools_context.inc files[] = plugins/views/views_content_plugin_display_panel_pane.inc files[] = plugins/views/views_content_plugin_style_ctools_context.inc -; Information added by Drupal.org packaging script on 2014-02-12 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.x-1.5" core = "7.x" project = "ctools" -datestamp = "1392220730" +datestamp = "1416423525" diff --git a/docroot/themes/bartik/bartik.info b/docroot/themes/bartik/bartik.info index 707072b9..60135d8a 100644 --- a/docroot/themes/bartik/bartik.info +++ b/docroot/themes/bartik/bartik.info @@ -34,8 +34,8 @@ regions[footer] = Footer settings[shortcut_module_link] = 0 -; Information added by Drupal.org packaging script on 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/themes/garland/garland.info b/docroot/themes/garland/garland.info index a991280c..12b8e352 100644 --- a/docroot/themes/garland/garland.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/themes/seven/seven.info b/docroot/themes/seven/seven.info index f3098b43..91414555 100644 --- a/docroot/themes/seven/seven.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488" diff --git a/docroot/themes/stark/stark.info b/docroot/themes/stark/stark.info index a2956da7..23c36119 100644 --- a/docroot/themes/stark/stark.info +++ b/docroot/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 2014-11-07 -version = "7.33" +; Information added by Drupal.org packaging script on 2014-11-19 +version = "7.34" project = "drupal" -datestamp = "1415375131" +datestamp = "1416429488"