Merge pull request #757 from jaredly/master

Allow theme config to be overridden by site config
hexojs · Jul 30, 2014 · 1b7490f · 1b7490f
2 parents 1545874 + 2fb8de2
commit 1b7490f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/theme/index.js b/lib/theme/index.js
@@ -66,7 +66,7 @@ Theme.prototype._generate = function(options, callback){
     config = hexo.config,
     route = hexo.route,
     siteLocals = hexo.locals._generate(),
-    themeLocals = _.extend({}, config, this.config),
+    themeLocals = _.extend({}, config, this.config, config.theme_config),
     env = hexo.env,
     i18n = this.i18n,
     layoutDir = pathFn.join(this.base, 'layout') + pathFn.sep,
@@ -204,4 +204,4 @@ Theme.prototype.getView = function(path){
   } else {
     return views[Object.keys(views)[0]];
   }
-};
+};