Merge branch 'master' into candidate

Nicholas Case · Nicholas Case · commit b0d41755d48e · 2018-07-27T06:48:32.000-07:00
diff --git a/src/lib/cookie/cookie.js b/src/lib/cookie/cookie.js
@@ -304,13 +304,15 @@ function readPublisherConsentCookie() {
 		return config.storePublisherConsentGlobally ?
 			readGlobalPublisherConsentCookie() : readLocalPublisherConsentCookie();
 	}
+	return Promise.resolve();
 }
 
 function writePublisherConsentCookie(publisherConsentData) {
 	if (config.storePublisherData) {
 		return config.storePublisherConsentGlobally ?
 			writeGlobalPublisherConsentCookie(publisherConsentData) : writeLocalPublisherConsentCookie(publisherConsentData);
 	}
+	return Promise.resolve();
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -304,13 +304,15 @@ function readPublisherConsentCookie() {`
`304`	`304`	`return config.storePublisherConsentGlobally ?`
`305`	`305`	`readGlobalPublisherConsentCookie() : readLocalPublisherConsentCookie();`
`306`	`306`	`}`
	`307`	`+ return Promise.resolve();`
`307`	`308`	`}`
`308`	`309`
`309`	`310`	`function writePublisherConsentCookie(publisherConsentData) {`
`310`	`311`	`if (config.storePublisherData) {`
`311`	`312`	`return config.storePublisherConsentGlobally ?`
`312`	`313`	`writeGlobalPublisherConsentCookie(publisherConsentData) : writeLocalPublisherConsentCookie(publisherConsentData);`
`313`	`314`	`}`
	`315`	`+ return Promise.resolve();`
`314`	`316`	`}`
`315`	`317`
`316`	`318`	`/**`