From 8e557811b8832dd6442ade9ab79f959e29e6adbe Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 2 Sep 2019 16:53:47 -0600
Subject: [PATCH 1/2] Ensure an auth instance is available to ListMediaInRoom

Fixes https://github.com/matrix-org/synapse/issues/5737
---
 synapse/rest/admin/media.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/synapse/rest/admin/media.py b/synapse/rest/admin/media.py
index f3f63f0be711..ed7086d09cb3 100644
--- a/synapse/rest/admin/media.py
+++ b/synapse/rest/admin/media.py
@@ -60,6 +60,7 @@ class ListMediaInRoom(RestServlet):
 
     def __init__(self, hs):
         self.store = hs.get_datastore()
+        self.auth = hs.get_auth()
 
     @defer.inlineCallbacks
     def on_GET(self, request, room_id):

From 1fc66fa6fdeaeea9b023aac3ef661cfa36d0a2d2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 2 Sep 2019 16:55:06 -0600
Subject: [PATCH 2/2] Changelog

---
 changelog.d/5967.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5967.bugfix

diff --git a/changelog.d/5967.bugfix b/changelog.d/5967.bugfix
new file mode 100644
index 000000000000..8d7bf5c2e907
--- /dev/null
+++ b/changelog.d/5967.bugfix
@@ -0,0 +1 @@
+Fix list media admin API always returning an error.