diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 41edd3d..4d90140 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -1797,7 +1797,6 @@ function _drupal_bootstrap_kernel() { function _drupal_bootstrap_page_cache() { global $user; - require_once __DIR__ . '/cache.inc'; require_once __DIR__ . '/database.inc'; // Check for a cache mode force from settings.php. if (settings()->get('page_cache_without_database')) { diff --git a/core/includes/cache.inc b/core/includes/cache.inc deleted file mode 100644 index 771d4d5..0000000 --- a/core/includes/cache.inc +++ /dev/null @@ -1,53 +0,0 @@ -get('library:info:' . $extension))) { + if (!isset($libraries[$extension]) && ($cache = \Drupal::cache()->get('library:info:' . $extension))) { $libraries[$extension] = $cache->data; } @@ -2900,7 +2900,7 @@ function drupal_get_library($extension, $name = NULL) { } } } - cache()->set('library:info:' . $extension, $libraries[$extension], Cache::PERMANENT, array( + \Drupal::cache()->set('library:info:' . $extension, $libraries[$extension], Cache::PERMANENT, array( 'extension' => array(TRUE, $extension), 'library_info' => array(TRUE), )); diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 872b55c..60121f7 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -296,7 +296,6 @@ function install_begin_request(&$install_state) { require_once __DIR__ . '/install.inc'; require_once __DIR__ . '/schema.inc'; require_once __DIR__ . '/../../' . settings()->get('path_inc', 'core/includes/path.inc'); - require_once __DIR__ . '/cache.inc'; require_once __DIR__ . '/database.inc'; require_once __DIR__ . '/form.inc'; require_once __DIR__ . '/batch.inc';