Merge 91f620b into 1da7ad5

hexojs · Jan 9, 2017 · f97fe42 · f97fe42
2 parents 1da7ad5 + 91f620b
commit f97fe42
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/plugins/helper/open_graph.js b/lib/plugins/helper/open_graph.js
@@ -85,8 +85,9 @@ function openGraphHelper(options) {
 
   images = images.map(function(path) {
     if (!urlFn.parse(path).host) {
-      if (path[0] !== '/') path = '/' + path;
-      return config.url + path;
+      // resolve `path`'s absolute path relative to current page's url
+      // `path` can be both absolute (starts with `/`) or relative.
+      return urlFn.resolve(url || config.url, path);
     }
 
     return path;

diff --git a/test/scripts/helpers/open_graph.js b/test/scripts/helpers/open_graph.js
@@ -217,6 +217,23 @@ describe('open_graph', function() {
     result.should.contain(meta({property: 'og:image', content: hexo.config.url + '/test.jpg'}));
   });
 
+  it('images - resolve relative path when site is hosted in subdirectory', function() {
+    var urlFn = require('url');
+    var config = hexo.config;
+    config.url = urlFn.resolve(config.url, 'blog');
+    config.root = 'blog';
+    var postUrl = urlFn.resolve(config.url, '/foo/bar/index.html');
+
+    var result = openGraph.call({
+      page: {},
+      config: config,
+      is_post: isPost,
+      url: postUrl
+    }, {images: 'test.jpg'});
+
+    result.should.contain(meta({property: 'og:image', content: urlFn.resolve(config.url, '/foo/bar/test.jpg')}));
+  });
+
   it('site_name - options', function() {
     var result = openGraph.call({
       page: {},