Merge branch 'master' of https://github.com/designcreateplay/NodeBB

package.json

@@ -1,31 +1,8 @@
 {
-  "author": "psychobunny <andrew@designcreateplay.com>, julianlam <julian@designcreateplay.com>, barisusakli <baris@designcreateplay.com>",
-  "contributors": [
-    {
-      "name": "Andrew Rodrigues",
-      "email": "andrew@designcreateplay.com"
-    },
-    {
-      "name": "Julian Lam",
-      "email": "julian@designcreateplay.com"
-    },
-    {
-      "name": "Barış Soner Uşaklı",
-      "email": "baris@designcreateplay.com"
-    },
-    {
-      "name": "Damian Bushong",
-      "url": "https://github.com/damianb"
-    },
-    {
-      "name": "Matt Smith",
-      "url": "https://github.com/soimafreak"
-    }
-  ],
-  "license": "GPLv3 or later",
   "name": "NodeBB",
+  "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -60,5 +37,27 @@
   },
   "engines": {
     "node": ">=0.8"
-  }
+  },
+  "contributors": [
+    {
+      "name": "Andrew Rodrigues",
+      "email": "andrew@designcreateplay.com"
+    },
+    {
+      "name": "Julian Lam",
+      "email": "julian@designcreateplay.com"
+    },
+    {
+      "name": "Barış Soner Uşaklı",
+      "email": "baris@designcreateplay.com"
+    },
+    {
+      "name": "Damian Bushong",
+      "url": "https://github.com/damianb"
+    },
+    {
+      "name": "Matt Smith",
+      "url": "https://github.com/soimafreak"
+    }
+  ]
 }

src/webserver.js

@@ -169,7 +169,7 @@ var express = require('express'),
 
 		app.get('/topic/:topic_id/:slug?', function(req, res) {
 			var tid = req.params.topic_id;
-			if (tid.match('.rss')) {
+			if (tid.match('\d+\.rss$')) {
 				fs.readFile('feeds/topics/' + tid, function (err, data) {
 					if (err) {
 						res.type('text').send(404, "Unable to locate an rss feed at this location.");
@@ -197,7 +197,7 @@ var express = require('express'),
 
 		app.get('/category/:category_id/:slug?', function(req, res) {
 			var cid = req.params.category_id;
-			if (cid.match('.rss')) {
+			if (cid.match('\d+\.rss$')) {
 				fs.readFile('feeds/categories/' + cid, function (err, data) {
 					if (err) {
 						res.type('text').send(404, "Unable to locate an rss feed at this location.");