fix(document): handle overwriting $session in execPopulate()

Re: #6754
Automattic · Jul 29, 2018 · bc21555 · bc21555
1 parent f3af885
commit bc21555
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -2771,8 +2771,13 @@ Document.prototype.populate = function populate() {
     if (this.$session() != null) {
       const session = this.$session();
       paths.forEach(path => {
-        path.options = path.options || {};
-        path.options.session = session;
+        if (path.options == null) {
+          path.options = { session: session };
+          return;
+        }
+        if (!('session' in path.options)) {
+          path.options.session = session;
+        }
       });
     }