v6.24.2. Bugfix.

- v6.24.2 March 8, 2013
	- Fixed regression from v6.24.1 that caused new installs or very old
upgrades to get stuck in the TOS section

History.md

@@ -1,6 +1,9 @@
 ## History
 
-- v6.24.1 March 7, 2013
+- v6.24.2 March 8, 2013
+	- Fixed regression from v6.24.1 that caused new installs or very old upgrades to get stuck in the TOS section
+
+- v6.24.1 March 8, 2013
 	- Typo fixes
 		- Fixes `getMixpanelInstance()` always re-creating the mixpanel instance instead of just doing it once
 		- Fixes `DocPad::getBlocks`

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "docpad",
-	"version": "6.24.1",
+	"version": "6.24.2",
 	"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
 	"homepage": "https://github.com/bevry/docpad",
 	"installUrl": "http://docpad.org/install",

src/lib/docpad.coffee

@@ -97,13 +97,16 @@ class DocPad extends EventEmitterEnhanced
 		if @mixpanelInstance? is false
 			config = @getConfig()
 			{reportStatistics,mixpanelToken} = config
-			if reportStatistics and mixpanelToken
-				try
-					@mixpanelInstance = require('mixpanel').init(mixpanelToken)
-				catch err
+			if reportStatistics? and mixpanelToken?
+				if reportStatistics and mixpanelToken
+					try
+						@mixpanelInstance = require('mixpanel').init(mixpanelToken)
+					catch err
+						@mixpanelInstance = false
+				else
 					@mixpanelInstance = false
 			else
-				@mixpanelInstance = false
+				@mixpanelInstance = null
 
 		# Return
 		return @mixpanelInstance