Merge pull request #1480 from Seao/master

Fix condition that use potential undefined variable and crash the application
apostrophecms · Jul 10, 2018 · 0e8c703 · 0e8c703
2 parents eeb2691 + 9ce0c0b
commit 0e8c703
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/modules/apostrophe-pieces-widgets/index.js b/lib/modules/apostrophe-pieces-widgets/index.js
@@ -294,7 +294,7 @@ module.exports = {
     // whether the join has relationship properties or not.
 
     self.pushPieceForWidget = function(widget, piece) {
-      if (self.joinById.relationship && (widget.by === 'id')) {
+      if (self.joinById && self.joinById.relationship && (widget.by === 'id')) {
         widget._pieces.push({
           item: piece,
           relationship: (widget[self.joinById.relationshipsField] || {})[piece._id]