Server: request scheduler refractoring

[github/Chocobozzz/PeerTube.git] / server / controllers / client.js

diff --git a/server/controllers/client.js b/server/controllers/client.js
index a5fac5626ee1e526984c20a36eed835fb13d8bf5..83243a4f74b9a5d89d7dd5a58d2202484887dbae 100644 (file)
--- a/server/controllers/client.js
+++ b/server/controllers/client.js
@@ -12,7 +12,7 @@ const db = require('../initializers/database')
 const router = express.Router()
 
 const opengraphComment = '<!-- opengraph tags -->'
-const distPath = path.join(__dirname, '../../client/dist')
+const distPath = path.join(__dirname, '..', '..', 'client/dist')
 const embedPath = path.join(distPath, 'standalone/videos/embed.html')
 const indexPath = path.join(distPath, 'index.html')
 
@@ -93,7 +93,7 @@ function generateWatchHtmlPage (req, res, next) {
     },
 
     video: function (callback) {
-      db.Video.loadAndPopulateAuthorAndPod(videoId, callback)
+      db.Video.loadAndPopulateAuthorAndPodAndTags(videoId, callback)
     }
   }, function (err, results) {
     if (err) return next(err)