Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Blog icon improvements #8298

Merged
merged 1 commit into from
Apr 10, 2017
Merged

🐛 Blog icon improvements #8298

merged 1 commit into from
Apr 10, 2017

Conversation

aileen
Copy link
Member

@aileen aileen commented Apr 10, 2017

refs #7688

  • renders the correct /favicon.ico or /favicon.png in {{ghost_head}}
  • removes an regex issue in serve-favicon

@aileen aileen mentioned this pull request Apr 10, 2017
Closed
@aileen aileen force-pushed the polish-that-blog-icon branch 2 times, most recently from a37a792 to 66fa4ce Compare April 10, 2017 06:07
@aileen
Copy link
Member Author

aileen commented Apr 10, 2017

@ErisDS this should be fine for review 🎉

@aileen
🐛 Blog icon improvements
9448179 
refs TryGhost#7688

- renders the correct `/favicon.ico` or `/favcicon.png` in `{{ghost_head}}`
- removes an regex issue in `serve-favicon`
aileen
aileen commented Apr 10, 2017
View reviewed changes
core/server/data/meta/asset_url.js
@@ -8,7 +8,7 @@ var config = require('../../config'),
*/
function getFaviconUrl() {
if (settingsCache.get('icon')) {
return utils.url.urlJoin(utils.url.getSubdir(), utils.url.urlFor('image', {image: settingsCache.get('icon')}));
return settingsCache.get('icon').match(/\.ico$/i) ? utils.url.urlJoin(utils.url.getSubdir(), '/favicon.ico') : utils.url.urlJoin(utils.url.getSubdir(), '/favicon.png');

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@ErisDS ErisDS merged commit 4ba5cc8 into TryGhost:master Apr 10, 2017
@aileen aileen deleted the polish-that-blog-icon branch October 13, 2017 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ErisDS ErisDS ErisDS left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aileen @ErisDS