Merge pull request #716 from matrix-org/bwindels/fixfilepanel

Fix filepanel also filtering main timeline with LL turned on.
matrix-org · Sep 4, 2018 · 3561fd1 · 3561fd1
2 parents a6c055b + 0d24c18
commit 3561fd1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/client.js b/src/client.js
@@ -2145,7 +2145,9 @@ function(roomId, fromToken, limit, dir, timelineFilter = undefined) {
 
     let filter = null;
     if (this._clientOpts.lazyLoadMembers) {
-        filter = LAZY_LOADING_MESSAGES_FILTER;
+        // create a shallow copy of LAZY_LOADING_MESSAGES_FILTER,
+        // so the timelineFilter doesn't get written into it below
+        filter = Object.assign({}, LAZY_LOADING_MESSAGES_FILTER);
     }
     if (timelineFilter) {
         // XXX: it's horrific that /messages' filter parameter doesn't match