Commit b5cee8fe authored by Dries's avatar Dries

- Patch #576096 by CorniI: use the new cache API.

parent 4c49bf4a
......@@ -10,19 +10,23 @@
* implementation during normal operations would have a negative impact
* on performance.
*/
class DrupalFakeCache implements DrupalCacheInterface {
function __construct($bin) {
}
function cache_get($key, $table = 'cache') {
return FALSE;
}
function get($cid) {
return FALSE;
}
function cache_get_multiple(array &$cids, $bin = 'cache') {
return array();
}
function getMultiple(&$cids) {
return array();
}
function cache_set($cid, $data, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) {
return;
}
function cache_clear_all($cid = NULL, $table = NULL, $wildcard = FALSE) {
return;
function set($cid, $data, $expire = CACHE_PERMANENT, array $headers = NULL) {
}
function clear($cid = NULL, $wildcard = FALSE) {
}
}
......@@ -257,6 +257,13 @@ function install_begin_request(&$install_state) {
drupal_load('module', 'filter');
drupal_load('module', 'user');
// Load the cache infrastructure with the Fake Cache. Switch to the database cache
// later if possible.
require_once DRUPAL_ROOT . '/includes/cache.inc';
require_once DRUPAL_ROOT . '/includes/cache-install.inc';
$conf['cache_inc'] = 'includes/cache.inc';
$conf['cache_default_class'] = 'DrupalFakeCache';
// Prepare for themed output, if necessary. We need to run this at the
// beginning of the page request to avoid a different theme accidentally
// getting set.
......@@ -271,8 +278,7 @@ function install_begin_request(&$install_state) {
// Since we have a database connection, we use the normal cache system.
// This is important, as the installer calls into the Drupal system for
// the clean URL checks, so we should maintain the cache properly.
require_once DRUPAL_ROOT . '/includes/cache.inc';
$conf['cache_inc'] = 'includes/cache.inc';
unset($conf['cache_default_class']);
// Initialize the database system. Note that the connection
// won't be initialized until it is actually requested.
......@@ -282,13 +288,6 @@ function install_begin_request(&$install_state) {
$task = install_verify_completed_task();
}
else {
// Since no persistent storage is available yet, and functions that check
// for cached data will fail, we temporarily replace the normal cache
// system with a stubbed-out version that short-circuits the actual
// caching process and avoids any errors.
require_once DRUPAL_ROOT . '/includes/cache-install.inc';
$conf['cache_inc'] = 'includes/cache-install.inc';
$task = NULL;
// Since previous versions of Drupal stored database connection information
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment