From 2366bfd1b52523ff617bea032222b0595eb1f2a6 Mon Sep 17 00:00:00 2001 From: Patrick Loughrey Date: Fri, 24 Sep 2021 11:11:10 -0400 Subject: [PATCH 1/2] Fixed merge branch issue --- modules/rubiconBidAdapter.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js index d502d7efb25..2b5ef362f7c 100644 --- a/modules/rubiconBidAdapter.js +++ b/modules/rubiconBidAdapter.js @@ -947,6 +947,11 @@ function appendSiteAppDevice(data, bidRequest, bidderRequest) { ['site', 'device'].forEach(function(param) { if (data[param]) { data[param].content = Object.assign({language: bidRequest.params.video.language}, data[param].content) + if (param === 'site') { + data[param].content = Object.assign({language: bidRequest.params.video.language}, data[param].content) + } else { + data[param] = Object.assign({language: bidRequest.params.video.language}, data[param]) + } } }); } From 44b549b29d306e7ad677be46385d1c71692bae65 Mon Sep 17 00:00:00 2001 From: Patrick Loughrey Date: Fri, 24 Sep 2021 11:29:21 -0400 Subject: [PATCH 2/2] Fixed merge branch issue --- modules/rubiconBidAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js index 2b5ef362f7c..eeac484ef9e 100644 --- a/modules/rubiconBidAdapter.js +++ b/modules/rubiconBidAdapter.js @@ -946,7 +946,6 @@ function appendSiteAppDevice(data, bidRequest, bidderRequest) { if (bidRequest.params.video.language) { ['site', 'device'].forEach(function(param) { if (data[param]) { - data[param].content = Object.assign({language: bidRequest.params.video.language}, data[param].content) if (param === 'site') { data[param].content = Object.assign({language: bidRequest.params.video.language}, data[param].content) } else {