Merge remote-tracking branch 'origin/develop' into develop

2018-02-16 16:01:17 +00:00 · 2018-02-16 16:01:17 +00:00 · cedfa4b607
parent f2903d1439 ad863afd6d
commit cedfa4b607
1 changed files with 1 additions and 1 deletions
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@ -35,7 +35,7 @@ const TagOrderActions = {};
 TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
    // Only commit tags if the state is ready, i.e. not null
    let tags = TagOrderStore.getOrderedTags();
-    let removedTags = TagOrderStore.getRemovedTagsAccountData();
+    let removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
    if (!tags) {
        return;
    }