From 5d5a0e3addd206f86a10e5be127efde0453cd419 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 6 Aug 2014 22:51:09 -0400
Subject: updated nuget

---
 .../Localization/JavaScript/javascript.json              |  2 +-
 .../Playlists/PlaylistManager.cs                         | 16 +++++-----------
 .../Security/EncryptionManager.cs                        |  9 ---------
 3 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 1c207b0a2c..b3ddcee79d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -135,7 +135,7 @@
     "HeaderSelectTranscodingPath": "Select Transcoding Temporary Path",
     "HeaderSelectImagesByNamePath": "Select Images By Name Path",
     "HeaderSelectMetadataPath": "Select Metadata Path",
-    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable. The location of this folder will directly impact server performance and should ideally be placed on a solid state drive.",
+    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable.",
     "HeaderSelectTranscodingPathHelp": "Browse or enter the path to use for transcoding temporary files. The folder must be writeable.",
     "HeaderSelectImagesByNamePathHelp": "Browse or enter the path to your items by name folder. The folder must be writeable.",
     "HeaderSelectMetadataPathHelp": "Browse or enter the path you'd like to store metadata within. The folder must be writeable.",
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index 6ab306c0ba..d461773522 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -147,11 +147,11 @@ namespace MediaBrowser.Server.Implementations.Playlists
             return path;
         }
 
-        private IEnumerable<BaseItem> GetPlaylistItems(IEnumerable<string> itemIds, string playlistMediaType, User user)
+        private IEnumerable<BaseItem> GetPlaylistItems(IEnumerable<string> itemIds, string playlistMediaType)
         {
             var items = itemIds.Select(i => _libraryManager.GetItemById(i)).Where(i => i != null);
 
-            return Playlist.GetPlaylistItems(playlistMediaType, items, user);
+            return Playlist.GetPlaylistItems(playlistMediaType, items, null);
         }
 
         public async Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds)
@@ -166,17 +166,11 @@ namespace MediaBrowser.Server.Implementations.Playlists
             var list = new List<LinkedChild>();
             var itemList = new List<BaseItem>();
 
-            foreach (var itemId in itemIds)
-            {
-                var item = _libraryManager.GetItemById(itemId);
-
-                if (item == null)
-                {
-                    throw new ArgumentException("No item exists with the supplied Id");
-                }
+            var items = GetPlaylistItems(itemIds, playlist.MediaType).ToList();
 
+            foreach (var item in items)
+            {
                 itemList.Add(item);
-
                 list.Add(LinkedChild.Create(item));
             }
 
diff --git a/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs b/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs
index 33818dcea9..cd9b9651ec 100644
--- a/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs
+++ b/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Controller.Security;
 using System;
-using System.Security.Cryptography;
 using System.Text;
 
 namespace MediaBrowser.Server.Implementations.Security
@@ -17,11 +16,7 @@ namespace MediaBrowser.Server.Implementations.Security
         {
             if (value == null) throw new ArgumentNullException("value");
 
-#if __MonoCS__
             return EncryptStringUniversal(value);
-#endif
-
-            return Encoding.Default.GetString(ProtectedData.Protect(Encoding.Default.GetBytes(value), null, DataProtectionScope.LocalMachine));
         }
 
         /// <summary>
@@ -34,11 +29,7 @@ namespace MediaBrowser.Server.Implementations.Security
         {
             if (value == null) throw new ArgumentNullException("value");
 
-#if __MonoCS__
             return DecryptStringUniversal(value);
-#endif
-
-            return Encoding.Default.GetString(ProtectedData.Unprotect(Encoding.Default.GetBytes(value), null, DataProtectionScope.LocalMachine));
         }
 
         private string EncryptStringUniversal(string value)
-- 
cgit v1.2.3