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

This commit is contained in:
Weblate 2017-11-20 16:05:44 +00:00
commit 9191618a11

View file

@ -92,7 +92,7 @@ export default withMatrixClient(React.createClass({
query = (query || "").toLowerCase();
if (query) {
memberList = memberList.filter((m) => {
const matchesName = m.displayname.toLowerCase().indexOf(query) !== -1;
const matchesName = (m.displayname || "").toLowerCase().includes(query);
const matchesId = m.userId.toLowerCase().includes(query);
if (!matchesName && !matchesId) {