--- remove-registry-1541674-34.patch Wed Aug 15 01:29:45 2012 +++ rr.patch Wed Aug 15 01:31:12 2012 @@ -1,22 +1,6 @@ - core/authorize.php | 2 +- - core/includes/bootstrap.inc | 183 ------------------ - core/includes/common.inc | 6 +- - core/includes/install.inc | 2 - - core/includes/module.inc | 4 - - core/includes/registry.inc | 198 -------------------- - core/lib/Drupal/Core/Database/Database.php | 2 - - .../EventSubscriber/RequestCloseSubscriber.php | 1 - - .../lib/Drupal/simpletest/WebTestBase.php | 38 ---- - core/modules/simpletest/simpletest.module | 40 +--- - .../system/Tests/Upgrade/UpgradePathTestBase.php | 9 - - core/modules/system/system.api.php | 53 ------ - core/modules/system/system.install | 70 +------ - core/modules/system/tests/registry.test | 144 -------------- - 14 files changed, 15 insertions(+), 737 deletions(-) - diff --git a/core/authorize.php b/core/authorize.php -index 0a13eb3..84760d8 100644 +index f76d68e..cd7ad1a 100644 --- a/core/authorize.php +++ b/core/authorize.php -@@ -70,7 +70,7 @@ require_once DRUPAL_ROOT . '/core/includes/module.inc'; +@@ -69,7 +69,7 @@ function authorize_access_allowed() { require_once DRUPAL_ROOT . '/core/includes/ajax.inc'; @@ -30,6 +14,6 @@ diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc -index 07c9d67..b7cd14b 100644 +index e26cb36..c46a80d 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc -@@ -282,16 +282,6 @@ const CHECK_PLAIN = 0; +@@ -286,16 +286,6 @@ const PASS_THROUGH = -1; @@ -50,3 +34,3 @@ * @see http://php.net/manual/language.functions.php -@@ -2390,13 +2380,6 @@ function _drupal_bootstrap_database() { +@@ -2365,13 +2355,6 @@ function _drupal_bootstrap_database() { // Initialize the database system. Note that the connection @@ -64,3 +48,3 @@ /** -@@ -2996,11 +2979,6 @@ function ip_address() { +@@ -3028,11 +3011,6 @@ function ip_address() { } @@ -76,3 +60,3 @@ * The class loader is responsible for lazy-loading all PSR-0 compatible -@@ -3086,167 +3064,6 @@ function drupal_classloader_register($name, $path) { +@@ -3118,167 +3096,6 @@ function drupal_classloader_register($name, $path) { } @@ -245,6 +229,6 @@ diff --git a/core/includes/common.inc b/core/includes/common.inc -index 0b95dcd..47403da 100644 +index 17e1363..6200b25 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc -@@ -7277,10 +7277,8 @@ function drupal_flush_all_caches() { +@@ -7052,10 +7052,8 @@ function drupal_flush_all_caches() { // Clear all non-drupal_static() static caches. @@ -262,6 +246,6 @@ diff --git a/core/includes/install.inc b/core/includes/install.inc -index 3f89516..baf5737 100644 +index 4c9c60c..53702d6 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc -@@ -154,8 +154,6 @@ function drupal_get_database_types() { +@@ -155,8 +155,6 @@ function drupal_get_database_types() { // We define a driver as a directory in /core/includes/database that in turn @@ -275,6 +259,6 @@ diff --git a/core/includes/module.inc b/core/includes/module.inc -index f40161d..2e57400 100644 +index ab45576..7c3ea94 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc -@@ -448,8 +448,6 @@ function module_enable($module_list, $enable_dependencies = TRUE) { +@@ -442,8 +442,6 @@ function module_enable($module_list, $enable_dependencies = TRUE) { system_list_reset(); @@ -287,3 +271,3 @@ // Update the theme registry to include it. -@@ -572,8 +570,6 @@ function module_disable($module_list, $disable_dependents = TRUE) { +@@ -566,8 +564,6 @@ function module_disable($module_list, $disable_dependents = TRUE) { // Invoke hook_modules_disabled before disabling modules, @@ -504,3 +488,3 @@ +++ b/core/lib/Drupal/Core/Database/Database.php -@@ -374,8 +374,6 @@ abstract class Database { +@@ -374,8 +374,6 @@ public static function addConnectionInfo($key, $target, $info) { throw new DriverNotSpecifiedException('Driver not specified for this database connection: ' . $key); @@ -514,9 +498,9 @@ diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php -index bae06fe..21d5223 100644 +index 6ca39db..175ce79 100644 --- a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php -@@ -54,7 +54,6 @@ class RequestCloseSubscriber implements EventSubscriberInterface { - } - } - +@@ -29,7 +29,6 @@ class RequestCloseSubscriber implements EventSubscriberInterface { + */ + public function onTerminate(PostResponseEvent $event) { + module_invoke_all('exit'); - _registry_check_code(REGISTRY_WRITE_LOOKUP_CACHE); @@ -526,6 +510,6 @@ diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php -index 3cdc3e9..a199aad 100644 +index bb2aef8..592d341 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php -@@ -614,8 +614,6 @@ abstract class WebTestBase extends TestBase { +@@ -614,8 +614,6 @@ protected function setUp() { include_once DRUPAL_ROOT . '/core/includes/install.inc'; @@ -538,3 +522,3 @@ variable_set('file_private_path', $this->private_files_directory); -@@ -685,42 +683,6 @@ abstract class WebTestBase extends TestBase { +@@ -686,42 +684,6 @@ protected function setUp() { } @@ -582,3 +566,3 @@ diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module -index 38c360b..9d72afc 100644 +index 4138916..cd0971b 100644 --- a/core/modules/simpletest/simpletest.module @@ -662,6 +646,6 @@ diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php -index 4d0d002..febaa62 100644 +index d97d7ae..847b412 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php -@@ -110,11 +110,6 @@ abstract class UpgradePathTestBase extends WebTestBase { +@@ -110,11 +110,6 @@ protected function setUp() { return FALSE; @@ -677,3 +661,3 @@ foreach ($this->databaseDumpFiles as $file) { -@@ -258,10 +253,6 @@ abstract class UpgradePathTestBase extends WebTestBase { +@@ -259,10 +254,6 @@ protected function performUpgrade($register_errors = TRUE) { drupal_load('module', $module); @@ -689,6 +673,6 @@ diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php -index 3f9fd17..14d2e03 100644 +index 142a366..1ed6e35 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php -@@ -3082,59 +3082,6 @@ function hook_disable() { +@@ -3076,59 +3076,6 @@ function hook_disable() { } @@ -753,6 +737,6 @@ diff --git a/core/modules/system/system.install b/core/modules/system/system.install -index 656b5b2..4bfc97d 100644 +index 0e42214..ea8b8ca 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install -@@ -1431,68 +1431,6 @@ function system_schema() { +@@ -1416,68 +1416,6 @@ function system_schema() { ), @@ -825,3 +809,3 @@ 'fields' => array( -@@ -1995,6 +1933,14 @@ function system_update_8013() { +@@ -2047,6 +1985,14 @@ function system_update_8016() { } @@ -831,3 +815,3 @@ + */ -+function system_update_8014() { ++function system_update_8017() { + db_drop_table('registry');