Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

2 files changed, 5 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 180bd3547..20cc7f82a 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -2056,6 +2056,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
         {
             var whereClauses = new List<string>();
 
+            if (EnableJoinUserData(query))
+            {
+                whereClauses.Add("UserId=@UserId");
+            }
             if (query.IsCurrentSchema.HasValue)
             {
                 if (query.IsCurrentSchema.Value)
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
index 8c521d88a..7f3b32e06 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
@@ -296,11 +296,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     }
                 }
 
-                return new UserItemData
-                {
-                    UserId = userId,
-                    Key = key
-                };
+                return null;
             }
         }