From 5f0e0c993ec19825c65e727028fe402bc58443ef Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 27 Aug 2013 14:16:56 -0400
Subject: [PATCH 1/3] adding localhost as default for email server

---
 src/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/user.js b/src/user.js
index 3ac1b7830d..5f84b492fb 100644
--- a/src/user.js
+++ b/src/user.js
@@ -3,7 +3,7 @@ var utils = require('./../public/src/utils.js'),
 	crypto = require('crypto'),
 	emailjs = require('emailjs'),
 	meta = require('./meta.js'),
-	emailjsServer = emailjs.server.connect(meta.config.mailer),
+	emailjsServer = emailjs.server.connect(meta.config.mailer || '127.0.0.1'),
 	bcrypt = require('bcrypt'),
 	notifications = require('./notifications.js'),
 	topics = require('./topics.js'),

From 54fdbcd947a62e163e804b287c8be0eec3d508da Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 27 Aug 2013 14:57:21 -0400
Subject: [PATCH 2/3] fixing broken category

---
 src/topics.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/topics.js b/src/topics.js
index a52e32c81a..9f26064016 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -561,20 +561,22 @@ var	RDB = require('./redis.js')
 							return callback(err, null);
 
 						var stripped = postData.content,
-							timestamp = postData.timestamp;
+							timestamp = postData.timestamp,
+							returnObj = {
+								"username": userData.username,
+								"picture": userData.picture,
+								"timestamp" : timestamp
+							};
 
 						if(postData.content) {
 							stripped = postData.content.replace(/>.+\n\n/, '');
 							postTools.toHTML(stripped, function(err, stripped) {
-								stripped = utils.strip_tags(stripped);
-
-								callback(null, {
-									"text": stripped,
-									"username": userData.username,
-									"picture": userData.picture,
-									"timestamp" : timestamp
-								});
+								returnObj.stripped = utils.strip_tags(stripped);
+								callback(null, returnObj);
 							});
+						} else {
+							returnObj.stripped = '';
+							callback(null, returnObj);
 						}
 					});
 				});

From 97641dbcda560e38d5e06f0a63f67f818c400cb1 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 27 Aug 2013 15:00:35 -0400
Subject: [PATCH 3/3] fixing teasers, that I broke in the last commit

---
 src/topics.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/topics.js b/src/topics.js
index 9f26064016..21a6861b54 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -568,14 +568,14 @@ var	RDB = require('./redis.js')
 								"timestamp" : timestamp
 							};
 
-						if(postData.content) {
+						if (postData.content) {
 							stripped = postData.content.replace(/>.+\n\n/, '');
 							postTools.toHTML(stripped, function(err, stripped) {
-								returnObj.stripped = utils.strip_tags(stripped);
+								returnObj.text = utils.strip_tags(stripped);
 								callback(null, returnObj);
 							});
 						} else {
-							returnObj.stripped = '';
+							returnObj.text = '';
 							callback(null, returnObj);
 						}
 					});