Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-14 19:42:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f6890cd971e5b66752d1073ac523b74af4cd9588' into v1.5.x

Browse Source
This commit is contained in:
Julian Lam
2017-07-28 11:54:34 -04:00
parent 7e2883ed34 f6890cd971
commit 4dc23c4dfe
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@@ -55,19 +55,19 @@
"morgan": "^1.3.2",
"mousetrap": "^1.5.3",
"nconf": "~0.8.2",
"nodebb-plugin-composer-default": "5.0.4",
"nodebb-plugin-composer-default": "5.0.5",
"nodebb-plugin-dbsearch": "2.0.6",
"nodebb-plugin-emoji-extended": "1.1.1",
"nodebb-plugin-emoji-one": "1.2.1",
"nodebb-plugin-markdown": "8.0.2",
"nodebb-plugin-markdown": "8.0.3",
"nodebb-plugin-mentions": "2.1.5",
"nodebb-plugin-soundpack-default": "1.0.0",
"nodebb-plugin-spam-be-gone": "0.5.0",
"nodebb-rewards-essentials": "0.0.9",
"nodebb-theme-lavender": "4.0.5",
"nodebb-theme-persona": "5.0.15",
"nodebb-theme-persona": "5.0.16",
"nodebb-theme-slick": "1.1.0",
"nodebb-theme-vanilla": "6.0.12",
"nodebb-theme-vanilla": "6.0.13",
"nodebb-widget-essentials": "3.0.1",
"nodemailer": "2.6.4",
"nodemailer-sendmail-transport": "1.0.0",

8
src/meta/tags.js
View File

@@ -50,7 +50,7 @@ Tags.parse = function (req, data, meta, link, callback) {
});
}
plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, defaultTags: defaultTags }, next);
plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, tags: defaultTags }, next);
},
links: function (next) {
var defaultLinks = [{
@@ -101,14 +101,14 @@ Tags.parse = function (req, data, meta, link, callback) {
href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-192.png',
});
}
plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, defaultLinks: defaultLinks }, next);
plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, links: defaultLinks }, next);
},
}, function (err, results) {
if (err) {
return callback(err);
}
meta = results.tags.defaultTags.concat(meta || []).map(function (tag) {
meta = results.tags.tags.concat(meta || []).map(function (tag) {
if (!tag || typeof tag.content !== 'string') {
winston.warn('Invalid meta tag. ', tag);
return tag;
@@ -139,7 +139,7 @@ Tags.parse = function (req, data, meta, link, callback) {
addIfNotExists(meta, 'property', 'og:image:height', 200);
}
link = results.links.defaultLinks.concat(link || []);
link = results.links.links.concat(link || []);
callback(null, {
meta: meta,