diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-14 14:46:55 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-14 14:46:55 +0000 |
commit | 15e988519749c92a6ff56ad8174cf17b9585bc64 (patch) | |
tree | 8184ed7827e1724ba58528acab89c7f4b4f9687f /synapse/storage | |
parent | Merge pull request #439 from matrix-org/daniel/typo (diff) | |
parent | Merge pull request #441 from matrix-org/markjh/fts_skip_invalid (diff) | |
download | synapse-15e988519749c92a6ff56ad8174cf17b9585bc64.tar.xz |
Merge branch 'release-v0.12.0' into develop
Diffstat (limited to 'synapse/storage')
-rw-r--r-- | synapse/storage/search.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py index 00f89ff02f..57c9cc1c5f 100644 --- a/synapse/storage/search.py +++ b/synapse/storage/search.py @@ -85,6 +85,11 @@ class SearchStore(BackgroundUpdateStore): # skip over it. continue + if not isinstance(value, basestring): + # If the event body, name or topic isn't a string + # then skip over it + continue + event_search_rows.append((event_id, room_id, key, value)) if isinstance(self.database_engine, PostgresEngine): |