3 files changed, 27 insertions, 4 deletions

diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade
index 2f175205..517b9d93 100644
--- a/client/components/lists/listBody.jade
+++ b/client/components/lists/listBody.jade
@@ -49,9 +49,10 @@ template(name="addCardForm")
     button.primary.confirm(type="submit") {{_ 'add'}}
     unless currentBoard.isTemplatesBoard
       unless currentBoard.isTemplateBoard
-        span.quiet
-          | {{_ 'or'}}
-          a.js-link {{_ 'link'}}
+        if linkCardsEnabled
+          span.quiet
+            | {{_ 'or'}}
+            a.js-link {{_ 'link'}}
         span.quiet
           |  
           | /
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index b0974705..6ed95a2a 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -5,6 +5,17 @@ BlazeComponent.extendComponent({
   onCreated() {
     // for infinite scrolling
     this.cardlimit = new ReactiveVar(InfiniteScrollIter);
+    this.linkCardsEnabled = new ReactiveVar(true);
+
+    Meteor.call('getLinkedCardsEnabled', (error, ret) => {
+      if (!error && ret) {
+        this.linkCardsEnabled.set(ret);
+      }
+    });
+  },
+
+  linkCardsEnabled() {
+    return this.linkCardsEnabled.get();
   },
 
   mixins() {
diff --git a/server/publications/cards.js b/server/publications/cards.js
index 61210ce5..f326ea04 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -1,4 +1,15 @@
 Meteor.publish('card', cardId => {
   check(cardId, String);
-  return Cards.find({ _id: cardId });
+  if (process.env.LINKED_CARDS_ENABLED === 'true') {
+    return Cards.find({ _id: cardId });
+  } else {
+    // TODO: test
+    return Cards.find({
+      _id: cardId,
+      linkedId: {$ne: [
+        null,
+        ''
+      ]}
+    });
+  }
 });