Patched some stuff and defined skeleton for ShopsMigration

tthoeye · May 24, 2012 · 02071c1 · 02071c1
1 parent db874b4
commit 02071c1
Show file tree

Hide file tree

Showing 8 changed files with 3,555 additions and 81 deletions.
diff --git a/www/732064-load-lock-api-early-93-D7.patch b/www/732064-load-lock-api-early-93-D7.patch
@@ -0,0 +1,25 @@
+diff --git includes/bootstrap.inc includes/bootstrap.inc
+index 177ae62..088ff5e 100644
+--- includes/bootstrap.inc
++++ includes/bootstrap.inc
+@@ -1936,6 +1936,11 @@ function _drupal_bootstrap_database() {
+   // Register autoload functions so that we can access classes and interfaces.
+   spl_autoload_register('drupal_autoload_class');
+   spl_autoload_register('drupal_autoload_interface');
++
++  // Allow specifying alternate lock implementations in settings.php, like
++  // those using APC or memcached.
++  require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'includes/lock.inc');
++  lock_initialize();
+ }
+
+ /**
+@@ -1961,8 +1966,6 @@ function _drupal_bootstrap_page_header() {
+   }
+
+   // Prepare for non-cached page workflow.
+-  require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'includes/lock.inc');
+-  lock_initialize();
+
+   if (!drupal_is_cli()) {
+     ob_start();
diff --git a/www/includes/bootstrap.inc b/www/includes/bootstrap.inc
@@ -2375,6 +2375,11 @@ function _drupal_bootstrap_database() {
   // the install or upgrade process.
   spl_autoload_register('drupal_autoload_class');
   spl_autoload_register('drupal_autoload_interface');
+
+  // Allow specifying alternate lock implementations in settings.php, like
+  // those using APC or memcached.
+  require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'includes/lock.inc');
+  lock_initialize();
 }
 
 /**
@@ -2399,6 +2404,8 @@ function _drupal_bootstrap_variables() {
  */
 function _drupal_bootstrap_page_header() {
   bootstrap_invoke_all('boot');
+  require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'includes/lock.inc');
+  lock_initialize();
 
   if (!drupal_is_cli()) {
     ob_start();