diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-14 12:45:09 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-14 12:45:09 -0400 |
| commit | 31ed30d5849c2454d16273228862c60f415f3c59 (patch) | |
| tree | 77ea44124bbb2054c010de3d9984797bfe410ddd | |
| parent | 41816585ed39cfe18d047c65db31e9fd6970c602 (diff) | |
update websocketsharp
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/ConnectManager.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 54ba9d252..972f3adb6 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -293,12 +293,6 @@ namespace MediaBrowser.Server.Implementations.Connect var user = GetUser(userId); - // See if it's already been set. - if (string.Equals(connectUser.Id, user.ConnectUserId, StringComparison.OrdinalIgnoreCase)) - { - return; - } - if (!string.IsNullOrWhiteSpace(user.ConnectUserId)) { await RemoveLink(user, connectUser).ConfigureAwait(false); diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index f95fd85b7..07ce3e4f0 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -453,5 +453,5 @@ "MessageYouHaveAnActiveRecurringMembership": "You have an active {0} membership. You can upgrade your plan using the options below.", "ButtonDelete": "Delete", "HeaderMediaBrowserAccountAdded": "Media Browser Account Added", - "MessageMediaBrowserAccontAdded": "A Media Browser account has been added to this user. An email has been sent to the owner of the account. They will need to confirm the invitation by clicking a link within the email." + "MessageMediaBrowserAccontAdded": "A Media Browser account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email." } |
