From f72e00a1b536fcf245e31d5e4418296640e00433 Mon Sep 17 00:00:00 2001 From: pichalite Date: Fri, 15 Jul 2016 23:43:49 +0000 Subject: [PATCH] pass dbset as attribute --- public/src/client/recent.js | 2 +- src/controllers/recent.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 1f6536327d..d8d195e7f3 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -133,7 +133,7 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite infinitescroll.loadMore('topics.loadMoreFromSet', { after: $('[component="category"]').attr('data-nextstart'), - set: 'topics:recent' + set: $('[component="category"]').attr('data-dbset') ? $('[component="category"]').attr('data-dbset') : 'topics:recent' }, function(data, done) { if (data.topics && data.topics.length) { Recent.onTopicsLoaded('recent', data.topics, false, done); diff --git a/src/controllers/recent.js b/src/controllers/recent.js index fe9355c533..ea9e4b4ad4 100644 --- a/src/controllers/recent.js +++ b/src/controllers/recent.js @@ -54,6 +54,7 @@ recentController.get = function(req, res, next) { var data = {}; data.topics = topics; data.nextStart = stop + 1; + data.dbSet = 'topics:recent'; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss'; data.title = '[[pages:recent]]';