Merge branch 'dev'

hexojs · Aug 29, 2013 · 277b6b4 · 277b6b4
2 parents e065c06 + 81dade8
commit 277b6b4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 REPORTER ?= dot
 
-build: install css
+build: css
 
 test:
 	node test --reporter $(REPORTER)

diff --git a/assets/themes/light b/assets/themes/light
diff --git a/lib/plugins/tag/index.js b/lib/plugins/tag/index.js
@@ -34,7 +34,7 @@ tag.register('anchor', link);
 
 tag.register('pullquote', require('./pullquote'), true);
 
-tag.register('raw', require('./raw'), true);
+tag.register('rawblock', require('./raw'), true);
 
 tag.register('vimeo', require('./vimeo'));
 

diff --git a/lib/post/render.js b/lib/post/render.js
@@ -28,6 +28,8 @@ module.exports = function(source, data, callback){
   // Loads tag plugins
   if (!swigInit) swig.init({tags: extend.tag.list()});
 
+  swigInit = true;
+
   /**
    * Replaces <escape>content</escape> in raw content with `<notextile>cache number</notextile>`,
    * and adds indent before the content to avoid markdown render error.

diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "hexo",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "A fast, simple & powerful blog framework, powered by Node.js.",
   "preferGlobal": true,
   "bin": {
     "hexo": "./bin/hexo"
   },
   "scripts": {
+    "prepublish": "make build",
     "test": "node test"
   },
   "directories": {