Merge remote-tracking branch 'origin'

This commit is contained in:
Julian Lam
2013-05-08 14:16:48 -04:00
11 changed files with 201 additions and 51 deletions

View File

@@ -98,7 +98,7 @@ var RDB = require('./redis.js'),
callback({
'category_name' : category_id ? category_name : 'Recent',
'show_topic_button' : category_id ? 'show' : 'hidden',
'category_id': category_id,
'category_id': category_id || 0,
'topics': topics
});
@@ -108,7 +108,7 @@ var RDB = require('./redis.js'),
callback({
'category_name' : category_id ? category_name : 'Recent',
'show_topic_button' : category_id ? 'show' : 'hidden',
'category_id': category_id,
'category_id': category_id || 0,
'topics': []
});
}