hopefully fixing #713

v1.18.x
Julian Lam 11 years ago
parent 9d452241ad
commit fe53037e53

@ -55,7 +55,7 @@ var path = require('path'),
/** /**
* `options` object requires: req, res * `options` object requires: req, res
* accepts: metaTags * accepts: metaTags, linkTags
*/ */
app.build_header = function (options, callback) { app.build_header = function (options, callback) {
var custom_header = { var custom_header = {
@ -83,8 +83,6 @@ var path = require('path'),
rel: 'apple-touch-icon', rel: 'apple-touch-icon',
href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png' href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'
}], }],
metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
linkTags = utils.buildLinkTags(defaultLinkTags.concat(options.linkTags || [])),
templateValues = { templateValues = {
cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css', cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
pluginCSS: plugins.cssFiles.map(function(file) { return { path: file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }), pluginCSS: plugins.cssFiles.map(function(file) { return { path: file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }),
@ -106,6 +104,13 @@ var path = require('path'),
var uid = '0'; var uid = '0';
// Meta Tags
templateValues.meta_tags = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])).map(function(tag) {
tag.content = tag.content.replace('"', '"').replace("'", ''');
return tag;
});
templateValues.link_tags = utils.buildLinkTags(defaultLinkTags.concat(options.linkTags || []));
if(options.req.user && options.req.user.uid) { if(options.req.user && options.req.user.uid) {
uid = options.req.user.uid; uid = options.req.user.uid;
} }

Loading…
Cancel
Save