aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-02-28 15:12:48 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-02-28 15:12:48 -0500
commit4947db0e2a8892fb723012e5403be3142dc88f0f (patch)
treef5b1f07fd019f53f68ae33d3041d63eb75edbf43
parent5e2e6b1716fc42afcb535351eec7fe4cca561ff8 (diff)
parent059898d5bd2c7d4fe48764fe47aa5b832c050fd4 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs2
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 0ed3b228e..f350b2885 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -165,7 +165,7 @@ namespace MediaBrowser.ServerApplication
var version = Kernel.InstallationManager.GetLatestCompatibleVersion(availablePackages, "MBServer", Kernel.Configuration.SystemUpdateLevel);
return version != null ? new CheckForUpdateResult {AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version} :
- new CheckForUpdateResult();
+ new CheckForUpdateResult {AvailableVersion = ApplicationVersion, IsUpdateAvailable = false};
}
/// <summary>
diff --git a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
index 848c6b1a0..db6d66b45 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
@@ -306,7 +306,7 @@
ApiClient.getAvailableApplicationUpdate().done(function (packageInfo) {
- var version = packageInfo.versions[0];
+ var version = packageInfo[0];
if (!version) {
$('#pUpToDate', page).show();