closes #2027

public/src/forum/category.js

@@ -42,8 +42,8 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
 			var clickedTid = $(this).parents('li.category-item[data-tid]').attr('data-tid');
 			$('#topics-container li.category-item').each(function(index, el) {
 				if($(el).offset().top - $(window).scrollTop() > 0) {
-					localStorage.setItem('category:bookmark', $(el).attr('data-tid'));
+					localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-tid'));
-					localStorage.setItem('category:bookmark:clicked', clickedTid);
+					localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedTid);
 					return false;
 				}
 			});
@@ -84,10 +84,20 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
 
 	$(window).on('action:popstate', function(ev, data) {
 		if(data.url.indexOf('category/') === 0) {
-			var bookmark = localStorage.getItem('category:bookmark');
+			var cid = data.url.match(/^category\/(\d+)/);
-			var clicked = localStorage.getItem('category:bookmark:clicked');
+			if (cid && cid[1]) {
+				cid = cid[1];
+			}
+			if (!cid) {
+				return;
+			}
+
+			var bookmark = localStorage.getItem('category:' + cid + ':bookmark');
+			var clicked = localStorage.getItem('category:' + cid + ':bookmark:clicked');
 
-			if (bookmark) {
+			if (!bookmark) {
+				return;
+			}
 
 			if(config.usePagination) {
 				socket.emit('topics.getTidPage', bookmark, function(err, page) {
@@ -101,7 +111,6 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
 					}
 				});
 			} else {
-
 				socket.emit('topics.getTidIndex', bookmark, function(err, index) {
 					if (err) {
 						return;
@@ -124,7 +133,6 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
 				});
 			}
 		}
-		}
 	});
 
 	Category.highlightTopic = function(tid) {

public/src/modules/alerts.js

@@ -6,7 +6,7 @@ define('alerts', function() {
 
 	module.alert = function (params) {
 		params.alert_id = 'alert_button_' + (params.alert_id ? params.alert_id : new Date().getTime());
-		params.title = params.title.trim() || '';
+		params.title = params.title ? params.title.trim() || '' : '';
 		params.message = params.message.trim();
 
 		params.location = params.location || 'right-top';