Skip to content
Snippets Groups Projects
Commit f8eedefc authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

#732064 follow up by pwolanin: move lock system loading earlier to avoid...

#732064 follow up by pwolanin: move lock system loading earlier to avoid stepping over it or attempting to use it before it is loaded
parent 51f7ee07
No related branches found
No related tags found
No related merge requests found
......@@ -1020,6 +1020,10 @@ function _drupal_bootstrap($phase) {
// Initialize the default database.
require_once './includes/database.inc';
db_set_active();
// Allow specifying alternate lock implementations in settings.php, like
// those using APC or memcached.
require_once variable_get('lock_inc', './includes/lock.inc');
lock_init();
break;
case DRUPAL_BOOTSTRAP_ACCESS:
......@@ -1060,8 +1064,6 @@ function _drupal_bootstrap($phase) {
exit;
}
// Prepare for non-cached page workflow.
require_once variable_get('lock_inc', './includes/lock.inc');
lock_init();
drupal_page_header();
break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment