Merge pull request #4858 from pichalite/change-recent

pass set as attribute for recent route
v1.18.x
Barış Soner Uşaklı 9 years ago committed by GitHub
commit 7804d3989e

@ -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-set') ? $('[component="category"]').attr('data-set') : 'topics:recent'
}, function(data, done) {
if (data.topics && data.topics.length) {
Recent.onTopicsLoaded('recent', data.topics, false, done);

@ -54,6 +54,7 @@ recentController.get = function(req, res, next) {
var data = {};
data.topics = topics;
data.nextStart = stop + 1;
data.set = 'topics:recent';
data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss';
data.title = '[[pages:recent]]';

Loading…
Cancel
Save