Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-25 02:31:59 -05:00
Code Issues Activity

Merge pull request #6856 from ErisDS/logo-fix

Browse source 
Don't clobber blog.logo in metadata
This commit is contained in:
Sebastian Gierlinger 2016-05-18 20:54:09 +02:00
commit e35e037c1a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/server/data/meta/index.js
View file

@ -1,4 +1,5 @@
var config = require('../../config'),
var _ = require('lodash'),
config = require('../../config'),
getUrl = require('./url'),
getCanonicalUrl = require('./canonical_url'),
getPaginatedUrl = require('./paginated_url'),
@ -19,9 +20,7 @@ var config = require('../../config'),
getExcerpt = require('./excerpt');
function getMetaData(data, root) {
var blog = config.theme, metaData;
metaData = {
var metaData = {
url: getUrl(data, true),
canonicalUrl: getCanonicalUrl(data),
previousUrl: getPaginatedUrl('prev', data, true),
@ -38,7 +37,7 @@ function getMetaData(data, root) {
publishedDate: getPublishedDate(data),
modifiedDate: getModifiedDate(data),
ogType: getOgType(data),
blog: blog
blog: _.cloneDeep(config.theme)
};
metaData.blog.logo = metaData.blog.logo ?