From ac77200683b9de4f03e410ea4f0899bcbd10429d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samy=20Pess=C3=A9?= <samypesse@gmail.com>
Date: Sat, 19 Sep 2015 00:31:32 +0200
Subject: [PATCH] Fix disabling a default plugin

---
 lib/configuration.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/configuration.js b/lib/configuration.js
index 34d6351cf..b3bc1463c 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -10,7 +10,7 @@ var i18n = require("./utils/i18n");
 var defaultsPlugins = ["highlight"];
 
 // Normalize a list of plugins to use
-function normalizePluginsList(plugins) {
+function normalizePluginsList(plugins, addDefaults) {
     // Normalize list to an array
     plugins = _.isString(plugins) ? plugins.split(",") : (plugins || []);
 
@@ -39,12 +39,14 @@ function normalizePluginsList(plugins) {
     .value();
 
     // Merge with defaults
-    plugins = _.chain(plugins)
-    .concat(_.map(defaultsPlugins, function(plugin) {
-        return { "name": plugin };
-    }))
-    .uniq()
-    .value();
+    if (addDefaults !== false) {
+        plugins = _.chain(plugins)
+        .concat(_.map(defaultsPlugins, function(plugin) {
+            return { "name": plugin };
+        }))
+        .uniq()
+        .value();
+    }
 
     // Build final list
     plugins = _.filter(plugins, function(plugin) {
@@ -121,7 +123,7 @@ Configuration.prototype.load = function() {
 
         that.options.output = path.resolve(that.options.output || that.book.resolve("_book"));
         that.options.plugins = normalizePluginsList(that.options.plugins);
-        that.options.defaultsPlugins = normalizePluginsList(that.options.defaultsPlugins || "");
+        that.options.defaultsPlugins = normalizePluginsList(that.options.defaultsPlugins || "", false);
         that.options.plugins = _.union(that.options.plugins, that.options.defaultsPlugins);
         that.options.plugins = _.uniq(that.options.plugins, "name");