Merge remote-tracking branch 'origin/master' into 0.5.1

public/src/forum/topic.js

@@ -351,7 +351,10 @@ define('forum/topic', dependencies, function(pagination, infinitescroll, threadT
 		utils.makeNumbersHumanReadable(element.find('.human-readable-number'));
 		element.find('span.timeago').timeago();
 		element.find('.post-content img:not(.emoji)').addClass('img-responsive').each(function() {
-			$(this).wrap('<a href="' + $(this).attr('src') + '" target="_blank">');
+			var $this = $(this);
+			if (!$this.parent().is('a')) {
+				$this.wrap('<a href="' + $this.attr('src') + '" target="_blank">');
+			}
 		});
 		postTools.updatePostCount();
 		showBottomPostBar();

src/middleware/index.js

@@ -41,7 +41,7 @@ function routeThemeScreenshots(app, themes) {
 			(function(id, path) {
 				fs.exists(path, function(exists) {
 					if (exists) {
-						app.get('/css/previews/' + id, function(req, res) {
+						app.get(relativePath + '/css/previews/' + id, function(req, res) {
 							res.sendfile(path);
 						});
 					}
@@ -173,7 +173,7 @@ module.exports = function(app, data) {
 	if(meta.config.cookieDomain) {
 		cookie.domain = meta.config.cookieDomain;
 	}
-	
+
 	app.use(session({
 		store: db.sessionStore,
 		secret: nconf.get('secret'),