Fix unset video language on video update

2 files changed, 7 insertions, 7 deletions

diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js
index 4a4c5e162..aeefaa555 100644
--- a/server/controllers/api/videos.js
+++ b/server/controllers/api/videos.js
@@ -444,12 +444,12 @@ function updateVideo (req, res, finalCallback) {
         transaction: t
       }
 
-      if (videoInfosToUpdate.name) videoInstance.set('name', videoInfosToUpdate.name)
-      if (videoInfosToUpdate.category) videoInstance.set('category', videoInfosToUpdate.category)
-      if (videoInfosToUpdate.licence) videoInstance.set('licence', videoInfosToUpdate.licence)
-      if (videoInfosToUpdate.language) videoInstance.set('language', videoInfosToUpdate.language)
-      if (videoInfosToUpdate.nsfw) videoInstance.set('nsfw', videoInfosToUpdate.nsfw)
-      if (videoInfosToUpdate.description) videoInstance.set('description', videoInfosToUpdate.description)
+      if (videoInfosToUpdate.name !== undefined) videoInstance.set('name', videoInfosToUpdate.name)
+      if (videoInfosToUpdate.category !== undefined) videoInstance.set('category', videoInfosToUpdate.category)
+      if (videoInfosToUpdate.licence !== undefined) videoInstance.set('licence', videoInfosToUpdate.licence)
+      if (videoInfosToUpdate.language !== undefined) videoInstance.set('language', videoInfosToUpdate.language)
+      if (videoInfosToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfosToUpdate.nsfw)
+      if (videoInfosToUpdate.description !== undefined) videoInstance.set('description', videoInfosToUpdate.description)
 
       videoInstance.save(options).asCallback(function (err) {
         return callback(err, t, tagInstances)
diff --git a/server/helpers/custom-validators/videos.js b/server/helpers/custom-validators/videos.js
index 8dabb828d..196731e04 100644
--- a/server/helpers/custom-validators/videos.js
+++ b/server/helpers/custom-validators/videos.js
@@ -53,7 +53,7 @@ function isVideoLicenceValid (value) {
 }
 
 function isVideoLanguageValid (value) {
-  return constants.VIDEO_LANGUAGES[value] !== undefined
+  return value === null || constants.VIDEO_LANGUAGES[value] !== undefined
 }
 
 function isVideoNSFWValid (value) {