From ca3629d89b6883c5571b1704c67eff17ec3e6e2b Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 13 Aug 2013 13:05:15 -0400
Subject: [PATCH] forgot to commit oops

---
 app.js       | 7 ++++++-
 src/posts.js | 9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index d445069f95..a320850f40 100644
--- a/app.js
+++ b/app.js
@@ -100,11 +100,16 @@ if(nconf.get('upgrade')) {
 						console.log('Info: Hardcoding uid 1 as an admin');
 						var user = require('./src/user.js');
 						user.makeAdministrator(1);
+
+
 					} else {
 						console.log('Info: Categories OK. Found ' + data.categories.length + ' categories.');
 					}
 				});
 			}
+
+
+
 			setup_categories();
 		}(global.configuration));
 	});
@@ -131,7 +136,7 @@ if(nconf.get('upgrade')) {
 				);
 			}
 		}
-
+		
 		process.exit();
 	});
 }
\ No newline at end of file
diff --git a/src/posts.js b/src/posts.js
index c377c3ed70..d21b2aea8e 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -11,7 +11,6 @@ var	RDB = require('./redis.js'),
 	plugins = require('./plugins'),
 	reds = require('reds'),
 	nconf = require('nconf'),
-	clientConfig = require('../public/config.json'),
 	postSearch = reds.createSearch('nodebbpostsearch');
 
 (function(Posts) {
@@ -174,7 +173,7 @@ var	RDB = require('./redis.js'),
 			type: 'error',
 			timeout: 2000,
 			title: 'Content too short',
-			message: "Please enter a longer post. At least " + Posts.minimumPostLength + " characters.",
+			message: "Please enter a longer post. At least " + config.minimumPostLength + " characters.",
 			alert_id: 'post_error'
 		});
 	}
@@ -182,7 +181,7 @@ var	RDB = require('./redis.js'),
 	Posts.emitTooManyPostsAlert = function(socket) {
 		socket.emit('event:alert', {
 			title: 'Too many posts!',
-			message: 'You can only post every '+ (nconf.get('post_delay') / 1000) + ' seconds.',
+			message: 'You can only post every '+ config.postDelay/1000 + ' seconds.',
 			type: 'error',
 			timeout: 2000
 		});
@@ -193,13 +192,13 @@ var	RDB = require('./redis.js'),
 			content = content.trim();
 		}
 
-		if (!content || content.length < clientConfig.minimumPostLength) {
+		if (!content || content.length < config.minimumPostLength) {
 			callback(new Error('content-too-short'), null);
 			return;
 		}
 
 		user.getUserField(uid, 'lastposttime', function(lastposttime) {
-			if(Date.now() - lastposttime < nconf.get('post_delay')) {
+			if(Date.now() - lastposttime < config.postDelay)) {
 				callback(new Error('too-many-posts'), null);
 				return;
 			}