From f4be279fc7748b88db2e567c3b00be4c731e52a1 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 27 Apr 2013 15:02:25 -0700
Subject: [PATCH] Make sure bookmarkcache is always loaded. Closes issue #966.

---
 common/modules/config.jsm | 1 +
 common/modules/main.jsm   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 99a8aff1..305880d3 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -108,6 +108,7 @@ var ConfigBase = Class("ConfigBase", {
         global: ["addons",
                  "base",
                  "io",
+                 ["bookmarkcache", "bookmarkcache"],
                  "buffer",
                  "cache",
                  "commands",
diff --git a/common/modules/main.jsm b/common/modules/main.jsm
index edd8c2e4..41ef16cf 100644
--- a/common/modules/main.jsm
+++ b/common/modules/main.jsm
@@ -173,7 +173,12 @@ overlay.overlayWindow(Object.keys(config.overlays), function _overlay(window) ({
 
         defineModule.time("load", null, function _load() {
             config.modules.global
-                  .forEach(function (name) defineModule.time("load", name, require, null, name, modules.jsmodules));
+                  .forEach(function (name) {
+                      if (!isArray(name))
+                          defineModule.time("load", name, require, null, name, modules.jsmodules);
+                      else
+                          lazyRequire(name[0], name.slice(1), modules.jsmodules);
+                  });
 
             config.modules.window
                   .forEach(function (name) defineModule.time("load", name, modules.load, modules, name));